Commit 284546b2 authored by Kevin Lyda's avatar Kevin Lyda

Merge branch 'master' into logo-white-compress

Conflicts:
	app/assets/images/logo-black.png
	app/assets/images/logo-white.png
parents dcaedb4a d28ee0df
language: ruby language: ruby
env: env:
- DB=mysql TRAVIS=true global:
- DB=mysql
- TRAVIS=true
matrix:
- TASK=spinach
- TASK=spec
- TASK=jasmine:ci
before_install: before_install:
- sudo apt-get install libicu-dev -y - sudo apt-get install libicu-dev -y
- gem install charlock_holmes -v="0.6.9"
branches: branches:
only: only:
- 'master' - 'master'
...@@ -11,8 +16,12 @@ rvm: ...@@ -11,8 +16,12 @@ rvm:
- 2.0.0 - 2.0.0
services: services:
- mysql - mysql
- postgresql - redis-server
before_script: before_script:
- "cp config/database.yml.$DB config/database.yml" - "cp config/database.yml.$DB config/database.yml"
- "cp config/gitlab.yml.example config/gitlab.yml" - "cp config/gitlab.yml.example config/gitlab.yml"
script: "bundle exec rake gitlab:test --trace" - "bundle exec rake db:setup"
- "bundle exec rake db:seed_fu"
script: "bundle exec rake $TASK --trace"
notifications:
email: false
v 6.5.0
- Dropdown menus on issue#show page for assignee and milestone (Jason Blanchard)
- Add color custimization and previewing to broadcast messages
- Fixed notes anchors
- Load new comments in issues dynamically
- Added sort options to Public page
- Added new filters(assigned/authored/all) to Dashboard#issues, Dashboard#merge_request pages
- Add project visibility icons to dashboard
- Enable secure cookies if https used
- Protect users/confirmation with rack_attack
- Default HTTP headers to protect against MIME-sniffing, force https if enabled
v6.4.3
- Don't use unicorn worker killer if PhusionPassenger is defined
v6.4.2
- Fixed wrong behaviour of script/upgrade.rb
v6.4.1
- Fixed bug with repository rename
- Fixed bug with project transfer
v 6.4.0
- Added sorting to project issues page (Jason Blanchard)
- Assembla integration (Carlos Paramio)
- Fixed another 500 error with submodules
- UI: More compact issues page
- Minimal password length increased to 8 symbols
- Side-by-side diff view (Steven Thonus)
- Internal projects (Jason Hollingsworth)
- Allow removal of avatar (Drew Blessing)
- Project web hooks now support issues and merge request events
- Visiting project page while not logged in will redirect to sign-in instead of 404 (Jason Hollingsworth)
- Expire event cache on avatar creation/removal (Drew Blessing)
- Archiving old projects (Steven Thonus)
- Rails 4
- Add time ago tooltips to show actual date/time
- UI: Fixed UI for admin system hooks
- Ruby script for easier GitLab upgrade
- Do not remove Merge requests if fork project was removed
- Improve sign-in/signup UX
- Add resend confirmation link to sign-in page
- Set noreply@HOSTNAME for reply_to field in all emails
- Show GitLab API version on Admin#dashboard
- API Cross-origin resource sharing
- Show READMe link at project home page
- Show repo size for projects in Admin area
v 6.3.0 v 6.3.0
- API for adding gitlab-ci service - API for adding gitlab-ci service
- Init script now waits for pids to appear after (re)starting before reporting status (Rovanion Luckey) - Init script now waits for pids to appear after (re)starting before reporting status (Rovanion Luckey)
- Restyle project home page - Restyle project home page
- Grammar fixes - Grammar fixes
- Show branches list (which branches contains commit) on commit page (Andrew Kumanyaev) - Show branches list (which branches contains commit) on commit page (Andrew Kumanyaev)
- Security improvements
- Added support for GitLab CI 4.0
- Fixed issue with 500 error when group did not exist
- Ability to leave project
- You can create file in repo using UI
- You can remove file from repo using UI
- API: dropped default_branch attribute from project during creation
- Project default_branch is not stored in db any more. It takes from repo now.
- Admin broadcast messages
- UI improvements
- Dont show last push widget if user removed this branch
- Fix 500 error for repos with newline in file name
- Extended html titles
- API: create/update/delete repo files
- Admin can transfer project to any namespace
- API: projects/all for admin users
- Fix recent branches order
v 6.2.4
- Security: Cast API private_token to string (CVE-2013-4580)
- Security: Require gitlab-shell 1.7.8 (CVE-2013-4581, CVE-2013-4582, CVE-2013-4583)
- Fix for Git SSH access for LDAP users
v 6.2.3
- Security: More protection against CVE-2013-4489
- Security: Require gitlab-shell 1.7.4 (CVE-2013-4490, CVE-2013-4546)
- Fix sidekiq rake tasks
v 6.2.2
- Security: Update gitlab_git (CVE-2013-4489)
v 6.2.1
- Security: Fix issue with generated passwords for new users
v 6.2.0 v 6.2.0
- Public project pages are now visible to everyone (files, issues, wik, etc.) - Public project pages are now visible to everyone (files, issues, wik, etc.)
...@@ -25,7 +106,7 @@ v 6.2.0 ...@@ -25,7 +106,7 @@ v 6.2.0
- Avatar upload on profile page with a maximum of 100KB (Steven Thonus) - Avatar upload on profile page with a maximum of 100KB (Steven Thonus)
- Store the sessions in Redis instead of the cookie store - Store the sessions in Redis instead of the cookie store
- Fixed relative links in markdown - Fixed relative links in markdown
- User must confirm his email if signup enabled - User must confirm their email if signup enabled
- User must confirm changed email - User must confirm changed email
v 6.1.0 v 6.1.0
...@@ -47,7 +128,7 @@ v 6.1.0 ...@@ -47,7 +128,7 @@ v 6.1.0
- Add links to create branch/tag from project home page - Add links to create branch/tag from project home page
- Add public-project? checkbox to new-project view - Add public-project? checkbox to new-project view
- Improved compare page. Added link to proceed into Merge Request - Improved compare page. Added link to proceed into Merge Request
- Send email to user when he was added to group - Send an email to a user when they are added to group
- New landing page when you have 0 projects - New landing page when you have 0 projects
v 6.0.0 v 6.0.0
...@@ -90,6 +171,14 @@ v 6.0.0 ...@@ -90,6 +171,14 @@ v 6.0.0
- Improved MR comments logic - Improved MR comments logic
- Render readme file for projects in public area - Render readme file for projects in public area
v 5.4.2
- Security: Cast API private_token to string (CVE-2013-4580)
- Security: Require gitlab-shell 1.7.8 (CVE-2013-4581, CVE-2013-4582, CVE-2013-4583)
v 5.4.1
- Security: Fixes for CVE-2013-4489
- Security: Require gitlab-shell 1.7.4 (CVE-2013-4490, CVE-2013-4546)
v 5.4.0 v 5.4.0
- Ability to edit own comments - Ability to edit own comments
- Documentation improvements - Documentation improvements
......
This diff is collapsed.
...@@ -8,15 +8,21 @@ def linux_only(require_as) ...@@ -8,15 +8,21 @@ def linux_only(require_as)
RUBY_PLATFORM.include?('linux') && require_as RUBY_PLATFORM.include?('linux') && require_as
end end
gem "rails", "3.2.15" gem "rails", "~> 4.0.0"
gem "protected_attributes"
gem 'rails-observers'
gem 'actionpack-page_caching'
gem 'actionpack-action_caching'
gem 'activerecord-deprecated_finders'
# Supported DBs # Supported DBs
gem "mysql2", group: :mysql gem "mysql2", group: :mysql
gem "pg", group: :postgres gem "pg", group: :postgres
# Auth # Auth
gem "devise", '~> 2.2' gem "devise", '3.0.4'
gem "devise-async" gem "devise-async", '0.8.0'
gem 'omniauth', "~> 1.1.3" gem 'omniauth', "~> 1.1.3"
gem 'omniauth-google-oauth2' gem 'omniauth-google-oauth2'
gem 'omniauth-twitter' gem 'omniauth-twitter'
...@@ -24,26 +30,27 @@ gem 'omniauth-github' ...@@ -24,26 +30,27 @@ gem 'omniauth-github'
# Extracting information from a git repository # Extracting information from a git repository
# Provide access to Gitlab::Git library # Provide access to Gitlab::Git library
gem "gitlab_git", "~> 3.0.0.rc1" gem "gitlab_git", "~> 4.0.0"
# Ruby/Rack Git Smart-HTTP Server Handler # Ruby/Rack Git Smart-HTTP Server Handler
gem 'gitlab-grack', '~> 1.0.1', require: 'grack' gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
# LDAP Auth # LDAP Auth
gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap" gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap"
# Syntax highlighter # Syntax highlighter
gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb' gem "gitlab-pygments.rb", '~> 0.5.4', require: 'pygments.rb'
# Git Wiki # Git Wiki
gem "gitlab-gollum-lib", "~> 1.0.1", require: 'gollum-lib' gem "gitlab-gollum-lib", "~> 1.0.2", require: 'gollum-lib'
# Language detection # Language detection
gem "github-linguist", require: "linguist" gem "gitlab-linguist", "~> 2.9.6", require: "linguist"
# API # API
gem "grape", "~> 0.4.1" gem "grape", "~> 0.6.1"
gem "grape-entity", "~> 0.3.0" gem "grape-entity", "~> 0.3.0"
gem 'rack-cors', require: 'rack/cors'
# Format dates and times # Format dates and times
# based on human-friendly examples # based on human-friendly examples
...@@ -72,13 +79,16 @@ gem "seed-fu" ...@@ -72,13 +79,16 @@ gem "seed-fu"
# Markdown to HTML # Markdown to HTML
gem "redcarpet", "~> 2.2.2" gem "redcarpet", "~> 2.2.2"
gem "github-markup", "~> 0.7.4", require: 'github/markup' gem "github-markup", "~> 0.7.4", require: 'github/markup', git: 'https://github.com/gitlabhq/markup.git', ref: '61ade389c1e1c159359338f570d18464a44ddbc4'
# Asciidoc to HTML # Asciidoc to HTML
gem "asciidoctor" gem "asciidoctor"
# Application server # Application server
gem "unicorn", '~> 4.6.3', group: :unicorn group :unicorn do
gem "unicorn", '~> 4.6.3'
gem 'unicorn-worker-killer'
end
# State machine # State machine
gem "state_machine" gem "state_machine"
...@@ -127,26 +137,24 @@ gem "sanitize" ...@@ -127,26 +137,24 @@ gem "sanitize"
# Protect against bruteforcing # Protect against bruteforcing
gem "rack-attack" gem "rack-attack"
group :assets do gem "sass-rails"
gem "sass-rails" gem "coffee-rails"
gem "coffee-rails" gem "uglifier"
gem "uglifier" gem "therubyracer"
gem "therubyracer" gem 'turbolinks'
gem 'turbolinks' gem 'jquery-turbolinks'
gem 'jquery-turbolinks'
gem 'chosen-rails', "1.0.1"
gem 'chosen-rails', "1.0.0" gem 'select2-rails'
gem 'select2-rails' gem 'jquery-atwho-rails', "~> 0.3.3"
gem 'jquery-atwho-rails', "0.3.0" gem "jquery-rails", "2.1.3"
gem "jquery-rails", "2.1.3" gem "jquery-ui-rails", "2.0.2"
gem "jquery-ui-rails", "2.0.2" gem "modernizr", "2.6.2"
gem "modernizr", "2.6.2" gem "raphael-rails", "~> 2.1.2"
gem "raphael-rails", "~> 2.1.2" gem 'bootstrap-sass', '~> 3.0'
gem 'bootstrap-sass' gem "font-awesome-rails", '~> 3.2'
gem "font-awesome-rails" gem "gemoji", "~> 1.3.0"
gem "gemoji", "~> 1.2.1", require: 'emoji/railtie' gem "gon", '~> 5.0.0'
gem "gon"
end
group :development do group :development do
gem "annotate", "~> 2.6.0.beta2" gem "annotate", "~> 2.6.0.beta2"
...@@ -169,7 +177,7 @@ end ...@@ -169,7 +177,7 @@ end
group :development, :test do group :development, :test do
gem 'coveralls', require: false gem 'coveralls', require: false
gem 'rails-dev-tweaks' # gem 'rails-dev-tweaks'
gem 'spinach-rails' gem 'spinach-rails'
gem "rspec-rails" gem "rspec-rails"
gem "capybara" gem "capybara"
...@@ -198,7 +206,7 @@ group :development, :test do ...@@ -198,7 +206,7 @@ group :development, :test do
gem 'poltergeist', '~> 1.4.1' gem 'poltergeist', '~> 1.4.1'
gem 'spork', '~> 1.0rc' gem 'spork', '~> 1.0rc'
gem 'jasmine' gem 'jasmine', '2.0.0.rc5'
end end
group :test do group :test do
......
This diff is collapsed.
This diff is collapsed.
## GitLab: self hosted Git management software ## GitLab: self hosted Git management software
![logo](https://raw.github.com/gitlabhq/gitlabhq/master/public/gitlab_logo.png) ![logo](https://gitlab.com/gitlab-org/gitlab-ce/raw/master/public/gitlab_logo.png)
![animated-screenshots](https://gist.github.com/fnkr/2f9badd56bfe0ed04ee7/raw/4f48806fbae97f556c2f78d8c2d299c04500cb0d/compiled.gif) ![animated-screenshots](https://gist.github.com/fnkr/2f9badd56bfe0ed04ee7/raw/4f48806fbae97f556c2f78d8c2d299c04500cb0d/compiled.gif)
...@@ -32,7 +32,9 @@ ...@@ -32,7 +32,9 @@
* GitLab.com commercial services: [Homepage](http://www.gitlab.com/) | [Subscription](http://www.gitlab.com/subscription/) | [Consultancy](http://www.gitlab.com/consultancy/) | [GitLab Cloud](http://www.gitlab.com/cloud/) | [Blog](http://blog.gitlab.com/) * GitLab.com commercial services: [Homepage](http://www.gitlab.com/) | [Subscription](http://www.gitlab.com/subscription/) | [Consultancy](http://www.gitlab.com/consultancy/) | [GitLab Cloud](http://www.gitlab.com/cloud/) | [Blog](http://blog.gitlab.com/)
* GitLab CI: [Readme](https://github.com/gitlabhq/gitlab-ci/blob/master/README.md) of the GitLab open-source continuous integration server * [GitLab Enterprise Edition](https://www.gitlab.com/features/) offers additional features that are useful for larger organizations (100+ users).
* [GitLab CI](https://gitlab.com/gitlab-org/gitlab-ci/blob/master/README.md) is a continuous integration (CI) server that is easy to integrate with GitLab.
### Requirements ### Requirements
...@@ -46,29 +48,24 @@ ...@@ -46,29 +48,24 @@
### Installation ### Installation
#### Official production installation #### Official installation methods
* [Installation guide for a production server](doc/install/installation.md)
* [Manual installation guide for a production server](doc/install/installation.md)
#### Official development installation * [GitLab Chef Cookbook](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/README.md) This cookbook can be used both for development installations and production installations. If you want to [contribute](CONTRIBUTE.md) to GitLab we suggest you follow the [development installation on a virtual machine with Vagrant](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/doc/development.md) instructions to install all testing dependencies.
If you want to contribute, please first read our [Contributing Guidelines](https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) and then we suggest you to use the Vagrant virtual machine project to get an environment working with all dependencies. #### Third party one-click installers
* [Vagrant virtual machine for development](https://github.com/gitlabhq/gitlab-vagrant-vm) * [Digital Ocean 1-Click Application Install](https://www.digitalocean.com/blog_posts/host-your-git-repositories-in-55-seconds-with-gitlab) Have a new server up in 55 seconds. Digital Ocean uses SSD disks which is great for an IO intensive app such as GitLab.
* [BitNami one-click installers](http://bitnami.com/stack/gitlab) This package contains both GitLab and GitLab CI. It is available as installer, virtual machine or for cloud hosting providers (Amazon Web Services/Azure/etc.).
#### Unofficial production installations #### Unofficial installation methods
* [GitLab recipes](https://github.com/gitlabhq/gitlab-recipes) repository with unofficial guides for using GitLab with different software (operating systems, webservers, etc.) than the official version. * [GitLab recipes](https://gitlab.com/gitlab-org/gitlab-recipes/) repository with unofficial guides for using GitLab with different software (operating systems, webservers, etc.) than the official version.
* [Installation guides](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Unofficial-Installation-Guides) public wiki with unofficial guides to install GitLab on different operating systems. * [Installation guides](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Unofficial-Installation-Guides) public wiki with unofficial guides to install GitLab on different operating systems.
* [BitNami one-click installers](http://bitnami.com/stack/gitlab)
* [TurnKey Linux virtual appliance](http://www.turnkeylinux.org/gitlab)
### New versions and upgrading ### New versions and upgrading
Since 2011 GitLab is released on the 22nd of every month. Every new release includes an upgrade guide. Since 2011 GitLab is released on the 22nd of every month. Every new release includes an upgrade guide.
...@@ -79,7 +76,6 @@ Since 2011 GitLab is released on the 22nd of every month. Every new release incl ...@@ -79,7 +76,6 @@ Since 2011 GitLab is released on the 22nd of every month. Every new release incl
* Features that will be in the next releases are listed on [the feedback and suggestions forum](http://feedback.gitlab.com/forums/176466-general) with the status [started](http://feedback.gitlab.com/forums/176466-general/status/796456) and [completed](http://feedback.gitlab.com/forums/176466-general/status/796457). * Features that will be in the next releases are listed on [the feedback and suggestions forum](http://feedback.gitlab.com/forums/176466-general) with the status [started](http://feedback.gitlab.com/forums/176466-general/status/796456) and [completed](http://feedback.gitlab.com/forums/176466-general/status/796457).
### Run in production mode ### Run in production mode
The Installation guide contains instructions on how to download an init script and run it automatically on boot. You can also start the init script manually: The Installation guide contains instructions on how to download an init script and run it automatically on boot. You can also start the init script manually:
...@@ -99,7 +95,7 @@ Start it with [Foreman](https://github.com/ddollar/foreman) ...@@ -99,7 +95,7 @@ Start it with [Foreman](https://github.com/ddollar/foreman)
or start each component separately or start each component separately
bundle exec rails s bundle exec rails s
bundle exec rake sidekiq:start script/background_jobs start
### Run the tests ### Run the tests
...@@ -110,7 +106,7 @@ or start each component separately ...@@ -110,7 +106,7 @@ or start each component separately
* Run all tests * Run all tests
bundle exec rake gitlab:test bundle exec rake gitlab:test RAILS_ENV=test
* [RSpec](http://rspec.info/) unit and functional tests * [RSpec](http://rspec.info/) unit and functional tests
...@@ -147,15 +143,17 @@ or start each component separately ...@@ -147,15 +143,17 @@ or start each component separately
* [Mailing list](https://groups.google.com/forum/#!forum/gitlabhq) and [Stack Overflow](http://stackoverflow.com/questions/tagged/gitlab) are the best places to ask questions. For example you can use it if you have questions about: permission denied errors, invisible repos, can't clone/pull/push or with web hooks that don't fire. Please search for similar issues before posting your own, there's a good chance somebody else had the same issue you have now and has resolved it. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there to a fix. * [Mailing list](https://groups.google.com/forum/#!forum/gitlabhq) and [Stack Overflow](http://stackoverflow.com/questions/tagged/gitlab) are the best places to ask questions. For example you can use it if you have questions about: permission denied errors, invisible repos, can't clone/pull/push or with web hooks that don't fire. Please search for similar issues before posting your own, there's a good chance somebody else had the same issue you have now and has resolved it. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there to a fix.
* [Unofficial #gitlab IRC on Freenode](http://www.freenode.net/) is another way to get in touch with other GitLab users who may be able to help you.
* [Feedback and suggestions forum](http://feedback.gitlab.com) is the place to propose and discuss new features for GitLab. * [Feedback and suggestions forum](http://feedback.gitlab.com) is the place to propose and discuss new features for GitLab.
* [Contributing guide](https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) describes how to submit pull requests and issues. Pull requests and issues not in line with the guidelines in this document will be closed. * [Contributing guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/masterCONTRIBUTING.md) describes how to submit merge requests and issues. Pull requests and issues not in line with the guidelines in this document will be closed.
* [Support subscription](http://www.gitlab.com/subscription/) connects you to the knowledge of GitLab experts that will resolve your issues and answer your questions. * [Support subscription](http://www.gitlab.com/subscription/) connects you to the knowledge of GitLab experts that will resolve your issues and answer your questions.
* [Consultancy](http://www.gitlab.com/consultancy/) allows you hire GitLab experts for installations, upgrades and customizations. * [Consultancy](http://www.gitlab.com/consultancy/) from the GitLab experts for installations, upgrades and customizations.
* [#gitlab IRC channel](http://www.freenode.net/) on Freenode to get in touch with other GitLab users and get help, it's managed by James Newton, Drew Blessing and Sam Gleske
* [Book](http://www.packtpub.com/gitlab-repository-management/book) written by GitLab enthusiast Jonathan M. Hethey is unofficial but it offers a good overview.
### Getting in touch ### Getting in touch
......
6.3.0.pre 6.5.0.pre
app/assets/images/favicon.ico

1.12 KB | W: 16px | H: 16px

app/assets/images/favicon.ico

32.2 KB | W: 64px | H: 64px

  • 2-up
  • Swipe
  • Onion skin
app/assets/images/logo-black.png

2.77 KB | W: 0px | H: 0px

app/assets/images/logo-black.png

2.95 KB | W: 0px | H: 0px

  • 2-up
  • Swipe
  • Onion skin
app/assets/images/logo-white.png

3.95 KB | W: 0px | H: 0px

app/assets/images/logo-white.png

8.14 KB | W: 0px | H: 0px

  • 2-up
  • Swipe
  • Onion skin
...@@ -8,6 +8,23 @@ class Admin ...@@ -8,6 +8,23 @@ class Admin
else else
elems.removeAttr 'disabled' elems.removeAttr 'disabled'
$('body').on 'click', '.js-toggle-colors-link', (e) ->
e.preventDefault()
$('.js-toggle-colors-link').hide()
$('.js-toggle-colors-container').show()
$('input#broadcast_message_color').on 'input', ->
previewColor = $('input#broadcast_message_color').val()
$('div.broadcast-message-preview').css('background-color', previewColor)
$('input#broadcast_message_font').on 'input', ->
previewColor = $('input#broadcast_message_font').val()
$('div.broadcast-message-preview').css('color', previewColor)
$('textarea#broadcast_message_message').on 'input', ->
previewMessage = $('textarea#broadcast_message_message').val()
$('div.broadcast-message-preview span').text(previewMessage)
$('.log-tabs a').click (e) -> $('.log-tabs a').click (e) ->
e.preventDefault() e.preventDefault()
$(this).tab('show') $(this).tab('show')
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
users_path: "/api/:version/users.json" users_path: "/api/:version/users.json"
user_path: "/api/:version/users/:id.json" user_path: "/api/:version/users/:id.json"
notes_path: "/api/:version/projects/:id/notes.json" notes_path: "/api/:version/projects/:id/notes.json"
namespaces_path: "/api/:version/namespaces.json"
# Get 20 (depends on api) recent notes # Get 20 (depends on api) recent notes
# and sort the ascending from oldest to newest # and sort the ascending from oldest to newest
...@@ -49,6 +50,20 @@ ...@@ -49,6 +50,20 @@
).done (users) -> ).done (users) ->
callback(users) callback(users)
# Return namespaces list. Filtered by query
namespaces: (query, callback) ->
url = Api.buildUrl(Api.namespaces_path)
$.ajax(
url: url
data:
private_token: gon.api_token
search: query
per_page: 20
dataType: "json"
).done (namespaces) ->
callback(namespaces)
buildUrl: (url) -> buildUrl: (url) ->
url = gon.relative_url_root + url if gon.relative_url_root? url = gon.relative_url_root + url if gon.relative_url_root?
return url.replace(':version', gon.api_version) return url.replace(':version', gon.api_version)
class BlobView class BlobView
constructor: -> constructor: ->
# handle multi-line select
handleMultiSelect = (e) ->
[ first_line, last_line ] = parseSelectedLines()
[ line_number ] = parseSelectedLines($(this).attr("id"))
hash = "L#{line_number}"
if e.shiftKey and not isNaN(first_line) and not isNaN(line_number)
if line_number < first_line
last_line = first_line
first_line = line_number
else
last_line = line_number
hash = if first_line == last_line then "L#{first_line}" else "L#{first_line}-#{last_line}"
setHash(hash)
e.preventDefault()
# See if there are lines selected # See if there are lines selected
# "#L12" and "#L34-56" supported # "#L12" and "#L34-56" supported
highlightBlobLines = -> highlightBlobLines = (e) ->
if window.location.hash isnt "" [ first_line, last_line ] = parseSelectedLines()
matches = window.location.hash.match(/\#L(\d+)(\-(\d+))?/)
first_line = parseInt(matches?[1])
last_line = parseInt(matches?[3])
unless isNaN first_line unless isNaN first_line
last_line = first_line if isNaN(last_line)
$("#tree-content-holder .highlight .line").removeClass("hll") $("#tree-content-holder .highlight .line").removeClass("hll")
$("#LC#{line}").addClass("hll") for line in [first_line..last_line] $("#LC#{line}").addClass("hll") for line in [first_line..last_line]
$("#L#{first_line}").ScrollTo() $("#L#{first_line}").ScrollTo() unless e?
# parse selected lines from hash
# always return first and last line (initialized to NaN)
parseSelectedLines = (str) ->
first_line = NaN
last_line = NaN
hash = str || window.location.hash
if hash isnt ""
matches = hash.match(/\#?L(\d+)(\-(\d+))?/)
first_line = parseInt(matches?[1])
last_line = parseInt(matches?[3])
last_line = first_line if isNaN(last_line)
[ first_line, last_line ]
setHash = (hash) ->
hash = hash.replace(/^\#/, "")
nodes = $("#" + hash)
# if any nodes are using this id, they must be temporarily changed
# also, add a temporary div at the top of the screen to prevent scrolling
if nodes.length > 0
scroll_top = $(document).scrollTop()
nodes.attr("id", "")
tmp = $("<div></div>")
.css({ position: "absolute", visibility: "hidden", top: scroll_top + "px" })
.attr("id", hash)
.appendTo(document.body)
window.location.hash = hash
# restore the nodes
if nodes.length > 0
tmp.remove()
nodes.attr("id", hash)
# initialize multi-line select
$("#tree-content-holder .line_numbers a[id^=L]").on("click", handleMultiSelect)
# Highlight the correct lines on load # Highlight the correct lines on load
highlightBlobLines() highlightBlobLines()
# Highlight the correct lines when the hash part of the URL changes # Highlight the correct lines when the hash part of the URL changes
$(window).on 'hashchange', highlightBlobLines $(window).on("hashchange", highlightBlobLines)
@BlobView = BlobView @BlobView = BlobView
...@@ -32,7 +32,9 @@ class CommitsList ...@@ -32,7 +32,9 @@ class CommitsList
url: location.href url: location.href
data: @data data: @data
complete: this.hideProgress complete: this.hideProgress
dataType: "script" success: (data) ->
CommitsList.append(data.count, data.html)
dataType: "json"
@append: (count, html) -> @append: (count, html) ->
$("#commits-list").append(html) $("#commits-list").append(html)
......
...@@ -54,7 +54,16 @@ ...@@ -54,7 +54,16 @@
unless terms is last_terms unless terms is last_terms
last_terms = terms last_terms = terms
if terms.length >= 2 or terms.length is 0 if terms.length >= 2 or terms.length is 0
form.submit() $.ajax
type: "GET"
url: location.href
data: "issue_search=" + terms
complete: ->
$(".loading").hide()
success: (data) ->
$('.issues-holder').html(data.html)
Issues.reload()
dataType: "json"
checkChanged: -> checkChanged: ->
checked_issues = $(".selected_issue:checked") checked_issues = $(".selected_issue:checked")
...@@ -70,3 +79,9 @@ ...@@ -70,3 +79,9 @@
$("#update_issues_ids").val [] $("#update_issues_ids").val []
$(".issues_bulk_update").hide() $(".issues_bulk_update").hide()
$(".issues-filters").show() $(".issues-filters").show()
$ ->
$('.edit-issue.inline-update input[type="submit"]').hide();
$("body").on "change", ".edit-issue.inline-update select", ->
$(this).submit()
window.updatePage = (data) ->
$.ajax({type: "GET", url: location.href, data: data, dataType: "script"})
window.slugify = (text) -> window.slugify = (text) ->
text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase() text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase()
...@@ -56,7 +53,7 @@ window.unbindEvents = -> ...@@ -56,7 +53,7 @@ window.unbindEvents = ->
document.addEventListener("page:fetch", startSpinner) document.addEventListener("page:fetch", startSpinner)
document.addEventListener("page:fetch", unbindEvents) document.addEventListener("page:fetch", unbindEvents)
document.addEventListener("page:receive", stopSpinner) document.addEventListener("page:change", stopSpinner)
$ -> $ ->
# Click a .one_click_select field, select the contents # Click a .one_click_select field, select the contents
...@@ -84,6 +81,7 @@ $ -> ...@@ -84,6 +81,7 @@ $ ->
$(@).parents('form').submit() $(@).parents('form').submit()
$("abbr.timeago").timeago() $("abbr.timeago").timeago()
$('.js-timeago').timeago()
# Flash # Flash
if (flash = $(".flash-container")).length > 0 if (flash = $(".flash-container")).length > 0
......
...@@ -83,12 +83,12 @@ class MergeRequest ...@@ -83,12 +83,12 @@ class MergeRequest
url: this.$('.nav-tabs .diffs-tab a').attr('href') url: this.$('.nav-tabs .diffs-tab a').attr('href')
beforeSend: => beforeSend: =>
this.$('.status').addClass 'loading' this.$('.status').addClass 'loading'
complete: => complete: =>
@diffs_loaded = true @diffs_loaded = true
this.$('.status').removeClass 'loading' this.$('.status').removeClass 'loading'
success: (data) =>
dataType: 'script' this.$(".diffs").html(data.html)
dataType: 'json'
showAllCommits: -> showAllCommits: ->
this.$('.first-commits').remove() this.$('.first-commits').remove()
......
$ ->
namespaceFormatResult = (namespace) ->
markup = "<div class='namespace-result'>"
markup += "<span class='namespace-kind'>" + namespace.kind + "</span>"
markup += "<span class='namespace-path'>" + namespace.path + "</span>"
markup += "</div>"
markup
formatSelection = (namespace) ->
namespace.kind + ": " + namespace.path
$('.ajax-namespace-select').each (i, select) ->
$(select).select2
placeholder: "Search for namespace"
multiple: $(select).hasClass('multiselect')
minimumInputLength: 0
query: (query) ->
Api.namespaces query.term, (namespaces) ->
data = { results: namespaces }
query.callback(data)
dropdownCssClass: "ajax-namespace-dropdown"
formatResult: namespaceFormatResult
formatSelection: formatSelection
This diff is collapsed.
This diff is collapsed.
class NotesVotes
updateVotes: ->
votes = $("#votes .votes")
notes = $("#notes-list .note .vote")
# only update if there is a vote display
if votes.size()
upvotes = notes.filter(".upvote").size()
downvotes = notes.filter(".downvote").size()
votesCount = upvotes + downvotes
upvotesPercent = (if votesCount then (100.0 / votesCount * upvotes) else 0)
downvotesPercent = (if votesCount then (100.0 - upvotesPercent) else 0)
# change vote bar lengths
votes.find(".bar-success").css "width", upvotesPercent + "%"
votes.find(".bar-danger").css "width", downvotesPercent + "%"
# replace vote numbers
votes.find(".upvotes").text votes.find(".upvotes").text().replace(/\d+/, upvotes)
votes.find(".downvotes").text votes.find(".downvotes").text().replace(/\d+/, downvotes)
@NotesVotes = NotesVotes
...@@ -19,8 +19,9 @@ ...@@ -19,8 +19,9 @@
data: "limit=" + @limit + "&offset=" + @offset data: "limit=" + @limit + "&offset=" + @offset
complete: -> complete: ->
$(".loading").hide() $(".loading").hide()
success: (data) ->
dataType: "script" Pager.append(data.count, data.html)
dataType: "json"
append: (count, html) -> append: (count, html) ->
$(".content_list").append html $(".content_list").append html
......
...@@ -40,3 +40,9 @@ $ -> ...@@ -40,3 +40,9 @@ $ ->
# Ref switcher # Ref switcher
$('.project-refs-select').on 'change', -> $('.project-refs-select').on 'change', ->
$(@).parents('form').submit() $(@).parents('form').submit()
$('.hide-no-ssh-message').on 'click', (e) ->
path = '/'
$.cookie('hide_no_ssh_message', 'false', { path: path })
$(@).parents('.no-ssh-key-message').hide()
e.preventDefault()
...@@ -46,11 +46,7 @@ class window.ContributorsGraph ...@@ -46,11 +46,7 @@ class window.ContributorsGraph
class window.ContributorsMasterGraph extends ContributorsGraph class window.ContributorsMasterGraph extends ContributorsGraph
constructor: (@data) -> constructor: (@data) ->
if $(window).width() > 1214 @width = $('.container').width() - 70
@width = 1100
else
@width = 870
@height = 200 @height = 200
@x = null @x = null
@y = null @y = null
...@@ -88,7 +84,6 @@ class window.ContributorsMasterGraph extends ContributorsGraph ...@@ -88,7 +84,6 @@ class window.ContributorsMasterGraph extends ContributorsGraph
x(d.date) x(d.date)
).y0(@height).y1((d) -> ).y0(@height).y1((d) ->
xa = d.commits = d.commits ? d.additions ? d.deletions xa = d.commits = d.commits ? d.additions ? d.deletions
console.log(xa)
y(xa) y(xa)
).interpolate("basis") ).interpolate("basis")
create_brush: -> create_brush: ->
...@@ -124,11 +119,7 @@ class window.ContributorsMasterGraph extends ContributorsGraph ...@@ -124,11 +119,7 @@ class window.ContributorsMasterGraph extends ContributorsGraph
class window.ContributorsAuthorGraph extends ContributorsGraph class window.ContributorsAuthorGraph extends ContributorsGraph
constructor: (@data) -> constructor: (@data) ->
if $(window).width() > 1214 @width = $('.container').width()/2 - 100
@width = 490
else
@width = 380
@height = 200 @height = 200
@x = null @x = null
@y = null @y = null
......
...@@ -6,12 +6,12 @@ $ -> ...@@ -6,12 +6,12 @@ $ ->
avatar = gon.gravatar_url avatar = gon.gravatar_url
avatar = avatar.replace('%{hash}', md5(user.email)) avatar = avatar.replace('%{hash}', md5(user.email))
avatar = avatar.replace('%{size}', '24') avatar = avatar.replace('%{size}', '24')
markup = "<div class='user-result'>"
markup += "<div class='user-image'><img class='avatar s24' src='" + avatar + "'></div>" "<div class='user-result'>
markup += "<div class='user-name'>" + user.name + "</div>" <div class='user-image'><img class='avatar s24' src='#{avatar}'></div>
markup += "<div class='user-username'>" + user.username + "</div>" <div class='user-name'>#{user.name}</div>
markup += "</div>" <div class='user-username'>#{user.username}</div>
markup </div>"
userFormatSelection = (user) -> userFormatSelection = (user) ->
user.name user.name
......
...@@ -9,36 +9,41 @@ ...@@ -9,36 +9,41 @@
*= require_self *= require_self
*/ */
@import "main/variables.scss";
@import "main/mixins.scss";
@import "main/fonts.scss";
/** /**
* GitLab bootstrap: * Customized Twitter bootstrap
*/ */
@import "gitlab_bootstrap.scss"; @import 'gl_bootstrap';
/**
* Font icons
*
*/
@import "font-awesome";
/**
* Generic css (forms, nav etc):
*/
@import "generic.scss";
/**
* Unrefactored css
*/
@import "common.scss"; @import "common.scss";
@import "selects.scss";
@import "sections/header.scss";
@import "sections/nav.scss";
@import "sections/commits.scss";
@import "sections/issues.scss";
@import "sections/projects.scss";
@import "sections/snippets.scss";
@import "sections/votes.scss";
@import "sections/merge_requests.scss";
@import "sections/graph.scss";
@import "sections/events.scss";
@import "sections/themes.scss";
@import "sections/tree.scss";
@import "sections/notes.scss";
@import "sections/profile.scss";
@import "sections/login.scss";
@import "sections/editor.scss";
@import "sections/admin.scss";
@import "sections/wiki.scss";
@import "sections/wall.scss";
@import "sections/dashboard.scss";
@import "sections/stat_graph.scss";
/**
* Page specific styles (issues, projects etc):
*/
@import "sections.scss";
/**
* Code ighlight
*/
@import "highlight/white.scss"; @import "highlight/white.scss";
@import "highlight/dark.scss"; @import "highlight/dark.scss";
@import "highlight/solarized_dark.scss"; @import "highlight/solarized_dark.scss";
...@@ -57,4 +62,3 @@ ...@@ -57,4 +62,3 @@
* Styles for JS behaviors. * Styles for JS behaviors.
*/ */
@import "behaviors.scss"; @import "behaviors.scss";
...@@ -5,6 +5,8 @@ html { ...@@ -5,6 +5,8 @@ html {
/** LAYOUT **/ /** LAYOUT **/
body { body {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
margin-bottom: 20px; margin-bottom: 20px;
} }
...@@ -117,18 +119,6 @@ p.time { ...@@ -117,18 +119,6 @@ p.time {
margin: 30px 3px 3px 2px; margin: 30px 3px 3px 2px;
} }
.search-holder {
label, input {
height: 30px;
padding: 0;
font-size: 14px;
}
label {
line-height: 30px;
color: #666;
}
}
.highlight { .highlight {
text-shadow: none; text-shadow: none;
} }
...@@ -207,7 +197,7 @@ li.note { ...@@ -207,7 +197,7 @@ li.note {
} }
.git_error_tips { .git_error_tips {
@extend .span6; @extend .col-md-6;
text-align: left; text-align: left;
margin-top: 40px; margin-top: 40px;
pre { pre {
...@@ -220,7 +210,6 @@ li.note { ...@@ -220,7 +210,6 @@ li.note {
.error-message { .error-message {
padding: 10px; padding: 10px;
background: #C67; background: #C67;
padding-left: 20px;
margin: 0; margin: 0;
color: #FFF; color: #FFF;
...@@ -228,8 +217,18 @@ li.note { ...@@ -228,8 +217,18 @@ li.note {
color: #fff; color: #fff;
text-decoration: underline; text-decoration: underline;
} }
&.centered { }
.no-ssh-key-message {
padding: 10px 0;
background: #C67;
margin: 0;
color: #FFF;
text-align: center; text-align: center;
a {
color: #fff;
text-decoration: underline;
} }
} }
...@@ -317,11 +316,6 @@ img.emoji { ...@@ -317,11 +316,6 @@ img.emoji {
margin-bottom: 10px; margin-bottom: 10px;
} }
.group-name {
font-size: 14px;
line-height: 24px;
}
table { table {
td.permission-x { td.permission-x {
background: #D9EDF7 !important; background: #D9EDF7 !important;
...@@ -341,4 +335,57 @@ table { ...@@ -341,4 +335,57 @@ table {
.navbar-gitlab .navbar-inner .nav > li .btn-sign-in { .navbar-gitlab .navbar-inner .nav > li .btn-sign-in {
@extend .btn-new; @extend .btn-new;
padding: 5px 15px; padding: 5px 15px;
text-shadow: none;
}
.broadcast-message {
padding: 10px;
text-align: center;
background: #555;
color: #BBB;
}
.broadcast-message-preview {
@extend .broadcast-message;
margin-bottom: 20px;
}
.ajax-users-select {
width: 400px;
&.input-large {
width: 210px;
}
&.input-clamp {
max-width: 100%;
}
}
.user-result {
.user-image {
float: left;
}
.user-name {
}
.user-username {
color: #999;
}
}
.namespace-result {
.namespace-kind {
color: #AAA;
font-weight: normal;
}
.namespace-path {
margin-left: 10px;
font-weight: bolder;
}
}
.side-filters {
fieldset {
margin-bottom: 15px;
}
} }
@import "generic/avatar.scss";
@import "generic/nav.scss";
@import "generic/common.scss";
@import "generic/typography.scss";
@import "generic/buttons.scss";
@import "generic/blocks.scss";
@import "generic/ui_box.scss";
@import "generic/issue_box.scss";
@import "generic/files.scss";
@import "generic/lists.scss";
@import "generic/forms.scss";
@import "generic/selects.scss";
.light-well {
background: #f9f9f9;
padding: 15px;
}
.btn { .btn {
display: inline-block; display: inline-block;
padding: 6px 12px;
margin-bottom: 0; margin-bottom: 0;
font-size: 13px; font-weight: normal;
line-height: $baseLineHeight;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
border: 1px solid #BBB; background-image: none;
color: $style_color; border: 1px solid transparent;
@include border-radius($baseBorderRadius); white-space: nowrap;
@include box-shadow(inset 0 1px 0 rgba(255,255,255,.2)); padding: 6px 12px;
@include linear-gradient(#f1f1f1, #e1e1e1); font-size: 13px;
text-shadow: 0 1px 1px #FFF; line-height: 18px;
text-decoration: none; border-radius: 4px;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
-o-user-select: none;
user-select: none;
color: #444444;
background-color: #fff;
border-color: #ccc;
text-shadow: none;
&.hover, &.hover,
&:hover { &:hover {
color: $style_color; color: #444444;
background: #f1f1f1;
border-color: #AAA;
text-decoration: none; text-decoration: none;
@include linear-gradient(#fAfAfA, #f1f1f1); background-color: #ebebeb;
border-color: #adadad;
} }
&.focus, &.focus,
&:focus { &:focus {
color: #444444;
text-decoration: none; text-decoration: none;
@include box-shadow(inset 0 2px 4px rgba(0,0,0,.15)); outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
} }
&.active, &.active,
&:active { &:active {
background-image: none;
outline: 0; outline: 0;
text-decoration: none; background-image: none;
@include box-shadow(inset 0 2px 4px rgba(0,0,0,.15)); -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
} }
&.disabled, &.disabled,
&[disabled] { &[disabled] {
cursor: default; cursor: not-allowed;
background-image: none; pointer-events: none;
@include opacity(65); opacity: 0.65;
@include box-shadow(none); filter: alpha(opacity=65);
-webkit-box-shadow: none;
box-shadow: none;
} }
&.btn-primary { &.btn-primary {
color: #FFF; color: #ffffff;
border-color: #189; background-color: #429bca;
text-shadow: 0 1px 1px #189; border-color: #358ebd;
@include linear-gradient(#4AC, #289);
&.hover, &.hover,
&:hover, &:hover,
&.disabled, &.disabled,
&[disabled] { &[disabled] {
color: #FFF; color: #ffffff;
background: #389; background-color: #3286b1;
border-color: #286e8e;
} }
} }
&.btn-success { &.btn-success {
color: #FFF; color: #ffffff;
border-color: #1A1; background-color: #5cb85c;
text-shadow: 0 1px 1px #FFF; border-color: #4cae4c;
text-shadow: 0 1px 1px #181;
@include linear-gradient(#62C452, #51a351);
&.hover, &.hover,
&:hover, &:hover,
&.disabled, &.disabled,
&[disabled] { &[disabled] {
color: #FFF; color: #ffffff;
background: #2A2; background-color: #47a447;
border-color: #398439;
} }
} }
&.btn-danger { &.btn-danger {
color: #FFF; color: #ffffff;
text-shadow: 0 1px 1px #811; background-color: #d9534f;
border-color: #BD362F; border-color: #d43f3a;
@include linear-gradient(#EE5F5B, #BD362F);
&.hover, &.hover,
&:hover, &:hover,
&.disabled, &.disabled,
&[disabled] { &[disabled] {
color: #FFF; color: #ffffff;
background: #A22; background-color: #d2322d;
border-color: #ac2925;
} }
} }
......
/** COLORS **/ /** COLORS **/
.cgray { color: gray } .cgray { color: gray }
.clgray { color: #BBB }
.cred { color: #D12F19 } .cred { color: #D12F19 }
.cgreen { color: #4a2 } .cgreen { color: #4a2 }
.cblue { color: #29A } .cblue { color: #29A }
.cblack { color: #111 } .cblack { color: #111 }
.cdark { color: #444 } .cdark { color: #444 }
.camber { color: #ffc000 }
.cwhite { color: #fff!important } .cwhite { color: #fff!important }
.bgred { background: #F2DEDE!important } .bgred { background: #F2DEDE!important }
...@@ -18,6 +20,7 @@ ...@@ -18,6 +20,7 @@
.append-right-10 { margin-right:10px } .append-right-10 { margin-right:10px }
.append-right-20 { margin-right:20px } .append-right-20 { margin-right:20px }
.append-bottom-10 { margin-bottom:10px } .append-bottom-10 { margin-bottom:10px }
.append-bottom-15 { margin-bottom:15px }
.append-bottom-20 { margin-bottom:20px } .append-bottom-20 { margin-bottom:20px }
.inline { display: inline-block } .inline { display: inline-block }
...@@ -67,12 +70,6 @@ ...@@ -67,12 +70,6 @@
} }
} }
.pagination ul > li > a, .pagination ul > li >span {
@include linear-gradient(#f1f1f1, #e1e1e1);
color: #333;
text-shadow: 0 1px 1px #FFF;
}
pre.well-pre { pre.well-pre {
border: 1px solid #EEE; border: 1px solid #EEE;
background: #f9f9f9; background: #f9f9f9;
...@@ -88,23 +85,14 @@ pre.well-pre { ...@@ -88,23 +85,14 @@ pre.well-pre {
@include box-shadow(inset 0 2px 4px rgba(0,0,0,.15)); @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
} }
.label {
padding: 2px 4px;
font-size: 12px;
font-style: normal;
font-weight: normal;
}
/** Big Labels **/ /** Big Labels **/
.state-label { .state-label {
font-size: 14px; font-size: 14px;
padding: 5px 15px; padding: 6px 25px;
text-align: center; text-align: center;
float: right;
position: relative;
top: -5px;
@include border-radius(4px); @include border-radius(4px);
text-shadow: none; text-shadow: none;
margin-left: 10px;
&.state-label-green { &.state-label-green {
background: #4A4; background: #4A4;
...@@ -116,3 +104,18 @@ pre.well-pre { ...@@ -116,3 +104,18 @@ pre.well-pre {
color: #FFF; color: #FFF;
} }
} }
.dropdown-menu > li > a {
text-shadow: none;
}
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
background: #29b;
}
.breadcrumb > li + li:before {
content: "/";
padding: 0;
color: #666;
}
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
} }
.file-title { .file-title {
border-bottom: 1px solid #bbb; background: #DDD;
@include bg-dark-gray-gradient; border-bottom: 1px solid #CCC;
text-shadow: 0 1px 1px #fff; text-shadow: 0 1px 1px #fff;
margin: 0; margin: 0;
font-weight: normal; font-weight: normal;
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
text-align: left; text-align: left;
color: $style_color; color: $style_color;
padding: 9px 10px; padding: 9px 10px;
height: 18px;
.options { .options {
float: right; float: right;
......
form {
@extend .form-horizontal;
label {
@extend .control-label;
}
}
input.input-xpadding,
.add-on.input-xpadding {
padding: 6px 10px;
}
.control-group {
.control-label {
padding-top: 6px;
}
.controls {
input, textarea {
padding: 6px 10px;
}
input[type="radio"], input[type="checkbox"] {
margin-top: 6px;
}
.add-on {
padding: 6px;
}
}
}
input[type='search'].search-text-input { input[type='search'].search-text-input {
background-image: url("icon-search.png"); background-image: url("icon-search.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 10px; background-position: 10px;
padding-left: 25px; padding-left: 25px;
@include border-radius(4px);
border: 1px solid #ccc;
} }
input[type='text'].danger { input[type='text'].danger {
...@@ -47,5 +13,37 @@ input[type='text'].danger { ...@@ -47,5 +13,37 @@ input[type='text'].danger {
fieldset legend { fieldset legend {
font-size: 16px; font-size: 16px;
margin-bottom: 10px; }
.datetime-controls {
select {
width: 100px;
}
}
.form-actions {
padding: 17px 20px 18px;
margin-top: 18px;
margin-bottom: 18px;
background-color: whitesmoke;
border-top: 1px solid #e5e5e5;
padding-left: 17%;
}
label {
&.control-label {
@extend .col-sm-2;
}
&.inline-label {
margin: 0;
}
}
.inline-input-group {
width: 250px;
}
.input-mx-250 {
max-width: 250px;
} }
/**
* Issue box:
* Huge block (one per page) for storing title, descripion and other information.
* Used for Issue#show page, MergeRequest#show page etc
*
* CLasses:
* .issue-box - Regular box
*/
.issue-box {
color: #666;
margin:20px 0;
background: #FAFAFA;
border: 1px solid #DDD;
.control-group {
margin-bottom: 0;
}
.title {
font-size: 20px;
font-weight: 500;
line-height: 28px;
margin: 0;
color: #444;
}
.context {
border: none;
background-color: #f5f5f5;
border: none;
border-top: 1px solid #eee;
}
.description {
border-top: 1px solid #eee;
}
.title, .context, .description {
padding: 15px;
.clearfix {
margin: 0;
}
}
}
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
*/ */
.well-list { .well-list {
margin: 0; margin: 0;
padding: 0;
list-style: none; list-style: none;
li { li {
padding: 10px; padding: 10px;
min-height: 20px; min-height: 20px;
......
...@@ -15,18 +15,21 @@ ...@@ -15,18 +15,21 @@
> li > a { > li > a {
border-left: 4px solid #EEE; border-left: 4px solid #EEE;
padding: 12px; padding: 12px;
color: #777;
} }
> .active > a { > .active > a {
border-color: $primary_color; border-color: $primary_color;
border-radius: 0; background: none;
background: #F1F1F1; color: #333;
color: $style_color; font-weight: bolder;
font-weight: bold;
text-shadow: 0 1px 1px #fff; &:hover {
background: none;
color: #333;
}
} }
&.nav-stacked-menu { &.nav-stacked-menu {
background: #FAFAFA;
li > a { li > a {
padding: 16px; padding: 16px;
} }
...@@ -36,6 +39,7 @@ ...@@ -36,6 +39,7 @@
&.nav-pills-small { &.nav-pills-small {
> li > a { > li > a {
padding: 8px 12px; padding: 8px 12px;
font-size: 12px;
} }
} }
} }
...@@ -49,38 +53,6 @@ ...@@ -49,38 +53,6 @@
* *
*/ */
.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; } .nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
.nav.nav-tabs {
li {
> a {
padding: 8px 20px;
margin-right: 7px;
line-height: 20px;
border-color: #EEE;
color: #888;
border-bottom: 1px solid #ddd;
.badge {
background-color: #eee;
color: #888;
text-shadow: 0 1px 1px #fff;
}
i[class^="icon-"] {
line-height: 14px;
}
}
&.active {
> a {
border-color: #CCC;
border-bottom: 1px solid #fff;
color: #333;
font-weight: bold;
}
}
}
&.nav-small-tabs > li > a { padding: 6px 9px; }
}
/** /**
* fix to keep tooltips position in top navigation bar * fix to keep tooltips position in top navigation bar
......
/** Chosen.js selectbox style override **/
.chosen-container {
min-width: 100px;
.chosen-single {
height: 26px;
background: #EEE !important;
border: 1px solid #DDD !important;
@include box-shadow(none !important);
@include border-radius(4px !important);
}
.chosen-results li.highlighted {
background: #29b;
}
.chosen-drop {
margin-top: 10px;
border: 1px solid #DDD !important;
@include border-radius(4px !important);
}
.chosen-search input {
border: 1px solid #CCC !important;
@include box-shadow(none !important);
}
}
/** Select2 styling **/
.select2-container .select2-choice {
@include bg-light-gray-gradient;
}
.select2-container .select2-choice div {
border: none;
background: none;
}
.select2-drop {
padding-top: 8px;
}
.select2-no-results, .select2-searching {
padding: 7px;
color: #666;
}
.chosen-container .chosen-single div b {
background-position-y: 0px !important;
}
.chosen-container .chosen-drop .chosen-search input {
background-position-y: -24px !important;
}
.chosen-compact {
max-width: 170px !important;
}
select {
&.chosen {
width: 100px;
}
&.chosen-sm {
width: 100px;
}
}
@media (min-width: $screen-sm-min) {
select {
&.chosen {
width: 150px;
}
&.chosen-sm {
width: 120px;
}
}
}
/* Medium devices (desktops, 992px and up) */
@media (min-width: $screen-md-min) {
select {
&.chosen {
width: 170px;
}
&.chosen-sm {
width: 140px;
}
}
}
/* Large devices (large desktops, 1200px and up) */
@media (min-width: $screen-lg-min) {
select {
&.chosen {
width: 200px;
}
&.chosen-sm {
width: 150px;
}
}
}
...@@ -2,11 +2,6 @@ ...@@ -2,11 +2,6 @@
* Headers * Headers
* *
*/ */
h1, h2, h3, h4, h5, h6 {
font-weight: 500;
line-height: 1.1;
}
h1.page-title { h1.page-title {
@include page-title; @include page-title;
font-size: 28px; font-size: 28px;
...@@ -99,6 +94,7 @@ a:focus { ...@@ -99,6 +94,7 @@ a:focus {
background: #f5f5f5; background: #f5f5f5;
} }
ul { ul {
padding: 0;
margin: 0 0 9px 25px !important; margin: 0 0 9px 25px !important;
} }
} }
......
/** /**
* =================================== * UI box:
* Contain UI block elements: * Block element for separating information on page.
* Used for storing issues lists, grouped data.
* You can have multiple ui boxes on one page
*
* Classes:
* .ui-box - for any block & widgets * .ui-box - for any block & widgets
* =================================== * .ui-box.ui-box-small - same but with smaller title
*/ * .ui-box.ui-box-danger - with red title
*
/** * Ex. 1: List
* UI Block * .ui-box
* .title
* # title here
* %ul
* # content here
*
* Ex. 2: Block data
* .ui-box
* .title
* # title here
* .body
* # content here
* *
*/ */
.ui-box { .ui-box {
background: #FFF; background: #FFF;
margin-bottom: 20px; margin-bottom: 20px;
border: 1px solid #DDD; border: 1px solid #DDD;
word-wrap: break-word; word-wrap: break-word;
&.small-box { img {
margin-bottom: 10px; max-width: 100%;
.title {
font-size: 13px;
line-height: 30px;
a {
color: #666;
&:hover {
text-decoration: underline;
}
}
}
} }
&.ui-box-show {
color: #666;
margin:20px 0;
background: #FFF;
box-shadow: inset 0 1px 0 #fff, 0 1px 5px #f1f1f1;
@include linear-gradient(#fafafa, #f1f1f1);
.control-group {
margin-bottom: 0;
}
}
&.ui-box-danger {
.title {
@include linear-gradient(#F26E5E, #bd362f);
color: #fff;
text-shadow: 0 1px 1px #900;
font-weight: bold;
}
}
img { max-width: 100%; }
pre { pre {
code { code {
background: none !important; background: none !important;
} }
} }
.ui-box-head,
.ui-box-body,
.ui-box-bottom {
padding: 15px;
.clearfix {
margin: 0;
}
}
.ui-box-head {
.box-title {
font-size: 18px;
font-weight: normal;
line-height: 28px;
margin: 0;
}
h3 {
margin: 0;
}
}
.ui-box-body {
border: none;
background-color: #f5f5f5;
border: none;
border-top: 1px solid #eee;
}
.ui-box-bottom {
border-top: 1px solid #eee;
}
ul { ul {
margin: 0; margin: 0;
padding: 0;
} }
.title { .title {
@include bg-gray-gradient; background-color: #EEE;
border-bottom: 1px solid #CCC; border-bottom: 1px solid #DDD;
color: #456; color: #666;
font-size: 16px; font-size: 16px;
text-shadow: 0 1px 1px #fff; text-shadow: 0 1px 1px #fff;
padding: 0 10px; padding: 0 10px;
...@@ -145,6 +94,10 @@ ...@@ -145,6 +94,10 @@
} }
} }
.body {
padding: 10px;
}
&.padded { &.padded {
h5, .title { h5, .title {
margin: -20px; margin: -20px;
...@@ -154,7 +107,7 @@ ...@@ -154,7 +107,7 @@
} }
.row_title { .row_title {
font-weight: bold; font-weight: 500;
color: #444; color: #444;
&:hover { &:hover {
color: #444; color: #444;
...@@ -176,13 +129,45 @@ ...@@ -176,13 +129,45 @@
} }
} }
/*
* Small box
*/
.ui-box.ui-box-small {
margin-bottom: 10px;
.title {
font-size: 13px;
line-height: 30px;
a {
color: #666;
&:hover {
text-decoration: underline;
}
}
}
}
/*
* Danger box
*/
.ui-box.ui-box-danger {
background: #f7f7f7;
border: none;
.title {
background: #D65;
color: #fff;
text-shadow: none;
font-weight: 500;
}
}
/*
* Block under tw-bootstrap tabs
*/
.tab-pane { .tab-pane {
.ui-box { .ui-box {
margin: 3px 3px 25px 3px; margin: 3px 3px 25px 3px;
} }
} }
.light-well {
background: #f9f9f9;
padding: 15px;
}
/** Override bootstrap variables **/ // Core variables and mixins
$baseFontSize: 13px !default;
$baseLineHeight: 18px !default;
/**
* BOOTSTRAP
*/
@import "bootstrap/variables"; @import "bootstrap/variables";
@import "bootstrap/mixins"; @import "bootstrap/mixins";
@import "bootstrap/reset";
// Reset
@import "bootstrap/normalize";
@import "bootstrap/print";
// Core CSS
@import "bootstrap/scaffolding"; @import "bootstrap/scaffolding";
@import "bootstrap/grid";
@import "bootstrap/layouts";
@import "bootstrap/type"; @import "bootstrap/type";
@import "bootstrap/code"; @import "bootstrap/code";
@import "bootstrap/forms"; @import "bootstrap/grid";
@import "bootstrap/tables"; @import "bootstrap/tables";
@import "bootstrap/sprites"; @import "bootstrap/forms";
@import "bootstrap/dropdowns";
@import "bootstrap/wells"; // Components
@import "bootstrap/component-animations"; @import "bootstrap/component-animations";
@import "bootstrap/close"; @import "bootstrap/dropdowns";
@import "bootstrap/button-groups"; @import "bootstrap/button-groups";
@import "bootstrap/alerts"; @import "bootstrap/input-groups";
@import "bootstrap/navs"; @import "bootstrap/navs";
@import "bootstrap/navbar"; @import "bootstrap/navbar";
@import "bootstrap/breadcrumbs"; @import "bootstrap/breadcrumbs";
@import "bootstrap/pagination"; @import "bootstrap/pagination";
@import "bootstrap/pager"; @import "bootstrap/pager";
@import "bootstrap/labels";
@import "bootstrap/badges";
@import "bootstrap/jumbotron";
@import "bootstrap/thumbnails";
@import "bootstrap/alerts";
@import "bootstrap/progress-bars";
@import "bootstrap/list-group";
@import "bootstrap/wells";
@import "bootstrap/close";
// Components w/ JavaScript
@import "bootstrap/modals"; @import "bootstrap/modals";
@import "bootstrap/tooltip"; @import "bootstrap/tooltip";
@import "bootstrap/popovers"; @import "bootstrap/popovers";
@import "bootstrap/thumbnails";
@import "bootstrap/media";
@import "bootstrap/labels-badges";
@import "bootstrap/progress-bars";
@import "bootstrap/accordion";
@import "bootstrap/carousel"; @import "bootstrap/carousel";
@import "bootstrap/hero-unit";
@import "bootstrap/utilities"; // Utility classes
.clearfix {
@include clearfix();
}
.center-block {
@include center-block();
}
.pull-right {
float: right !important;
}
.pull-left {
float: left !important;
}
.hide {
display: none;
}
.show {
display: block !important;
}
.invisible {
visibility: hidden;
}
.text-hide {
@include text-hide();
}
.hidden {
display: none !important;
visibility: hidden !important;
}
.affix {
position: fixed;
}
@import "bootstrap/responsive-utilities"; @import "bootstrap/responsive-utilities";
@import "bootstrap/responsive-1200px-min";
/** // Labels
* Font icons .label {
* padding: 2px 4px;
*/ font-size: 12px;
@import "font-awesome"; font-style: normal;
font-weight: normal;
display: inline-block;
&.label-gray {
background-color: #eee;
color: #999;
text-shadow: none;
}
&.label-inverse {
background-color: #333333;
}
}
// Nav tabs
.nav.nav-tabs {
li {
> a {
padding: 8px 20px;
margin-right: 7px;
line-height: 20px;
border-color: #EEE;
color: #888;
border-bottom: 1px solid #ddd;
.badge {
background-color: #eee;
color: #888;
text-shadow: 0 1px 1px #fff;
}
i[class^="icon-"] {
line-height: 14px;
}
}
&.active {
> a {
border-color: #CCC;
border-bottom: 1px solid #fff;
color: #333;
font-weight: bold;
}
}
}
/** &.nav-small-tabs > li > a {
* GitLab bootstrap. padding: 6px 9px;
* Overrides some styles of twitter bootstrap. }
* Also give some common classes for GitLab app }
*/
@import "gitlab_bootstrap/variables.scss";
@import "gitlab_bootstrap/fonts.scss";
@import "gitlab_bootstrap/mixins.scss";
@import "gitlab_bootstrap/avatar.scss";
@import "gitlab_bootstrap/nav.scss";
@import "gitlab_bootstrap/common.scss";
@import "gitlab_bootstrap/typography.scss";
@import "gitlab_bootstrap/buttons.scss";
@import "gitlab_bootstrap/blocks.scss";
@import "gitlab_bootstrap/files.scss";
@import "gitlab_bootstrap/lists.scss";
@import "gitlab_bootstrap/forms.scss";
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to)); background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to));
background-image: -webkit-linear-gradient($from, $to); background-image: -webkit-linear-gradient($from, $to);
background-image: -moz-linear-gradient($from, $to); background-image: -moz-linear-gradient($from, $to);
background-image: -ms-linear-gradient($from, $to);
background-image: -o-linear-gradient($from, $to); background-image: -o-linear-gradient($from, $to);
} }
...@@ -45,6 +46,7 @@ ...@@ -45,6 +46,7 @@
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1)); background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1));
background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1); background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1); background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
background-image: -ms-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1); background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
} }
...@@ -53,6 +55,7 @@ ...@@ -53,6 +55,7 @@
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -ms-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
} }
...@@ -60,6 +63,7 @@ ...@@ -60,6 +63,7 @@
background: #eee; background: #eee;
background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7); background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);
background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7); background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);
background-image: -ms-linear-gradient(#e9e9e9, #d7d7d7);
background-image: -o-linear-gradient(#e9e9e9, #d7d7d7); background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);
} }
...@@ -75,20 +79,40 @@ ...@@ -75,20 +79,40 @@
color: $style_color; color: $style_color;
text-shadow: 0 1px 1px #FFF; text-shadow: 0 1px 1px #FFF;
font-size: 16px; font-size: 16px;
line-height: 40px; line-height: 44px;
font-weight: normal; font-weight: normal;
} }
@mixin md-typography { @mixin md-typography {
img {
max-width: 100%;
}
*:first-child { *:first-child {
margin-top: 0; margin-top: 0;
} }
code { padding: 0 4px; } code { padding: 0 4px; }
h1 { margin-top: 30px;}
h2 { margin-top: 25px;} h1 {
h3 { margin-top: 20px;} margin-top: 45px;
h4 { margin-top: 15px;} font-size: 2.5em;
}
h2 {
margin-top: 40px;
font-size: 2em;
}
h3 {
margin-top: 35px;
font-size: 2em;
}
h4 {
margin-top: 30px;
font-size: 1.5em;
}
blockquote p { blockquote p {
color: #888; color: #888;
...@@ -103,10 +127,20 @@ ...@@ -103,10 +127,20 @@
background: #EEE; background: #EEE;
} }
} }
code {
font-size: inherit;
font-weight: inherit;
color: #555;
}
li {
line-height: 1.5;
}
} }
@mixin page-title { @mixin page-title {
color: $style_color; color: #333;
font-size: 20px; font-size: 20px;
line-height: 1.5; line-height: 1.5;
margin-top: 0px; margin-top: 0px;
......
/** Override bootstrap variables **/
$font-size-base: 13px !default;
/** /**
* General Colors * General Colors
*/ */
......
@import "sections/header.scss";
@import "sections/nav.scss";
@import "sections/commits.scss";
@import "sections/issues.scss";
@import "sections/projects.scss";
@import "sections/snippets.scss";
@import "sections/votes.scss";
@import "sections/merge_requests.scss";
@import "sections/graph.scss";
@import "sections/events.scss";
@import "sections/themes.scss";
@import "sections/tree.scss";
@import "sections/notes.scss";
@import "sections/profile.scss";
@import "sections/login.scss";
@import "sections/editor.scss";
@import "sections/admin.scss";
@import "sections/wiki.scss";
@import "sections/wall.scss";
@import "sections/dashboard.scss";
@import "sections/stat_graph.scss";
...@@ -20,4 +20,19 @@ ...@@ -20,4 +20,19 @@
label { width: 110px; } label { width: 110px; }
.controls { margin-left: 130px; } .controls { margin-left: 130px; }
.form-actions { padding-left: 130px; background: #fff } .form-actions { padding-left: 130px; background: #fff }
.visibility-levels {
.controls {
margin-bottom: 9px;
}
i {
color: inherit;
}
}
}
.broadcast-messages {
.message {
line-height: 2;
}
} }
...@@ -16,36 +16,29 @@ ...@@ -16,36 +16,29 @@
.header { .header {
@extend .clearfix; @extend .clearfix;
background: #DDD;
border-bottom: 1px solid #CCC;
padding: 5px 5px 5px 10px; padding: 5px 5px 5px 10px;
color: #555; color: #555;
border-bottom: 1px solid #CCC;
background: #eee;
// TODO Replace with linear-gradient mixin
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
a{
color: $style_color;
}
> span { > span {
font-family: $monospace_font; font-family: $monospace_font;
font-size: 14px; font-size: 14px;
line-height: 30px; line-height: 2;
} }
a.view-file{ .view-file {
font-weight: bold; font-weight: bold;
float: right;
background-color: #EEE;
} }
.commit-short-id{ .commit-short-id {
font-family: $monospace_font; font-family: $monospace_font;
font-size: smaller; font-size: smaller;
} }
.file-mode{ .file-mode {
font-family: $monospace_font; font-family: $monospace_font;
} }
} }
...@@ -55,13 +48,13 @@ ...@@ -55,13 +48,13 @@
background: #FFF; background: #FFF;
color: #333; color: #333;
font-size: 12px; font-size: 12px;
.old{ .old {
span.idiff{ span.idiff {
background-color: #FAA; background-color: #FAA;
} }
} }
.new{ .new {
span.idiff{ span.idiff {
background-color: #AFA; background-color: #AFA;
} }
} }
...@@ -77,7 +70,7 @@ ...@@ -77,7 +70,7 @@
font-size: 12px; font-size: 12px;
} }
} }
.old_line, .new_line { .old_line, .new_line, .diff_line {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
border: none; border: none;
...@@ -87,7 +80,7 @@ ...@@ -87,7 +80,7 @@
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
text-align: right; text-align: right;
min-width: 35px; min-width: 35px;
max-width: 35px; max-width: 50px;
width: 35px; width: 35px;
@include user-select(none); @include user-select(none);
a { a {
...@@ -99,6 +92,15 @@ ...@@ -99,6 +92,15 @@
text-decoration: underline; text-decoration: underline;
} }
} }
&.new {
background: #CFD;
}
&.old {
background: #FDD;
}
}
.diff_line {
padding: 0;
} }
.line_holder { .line_holder {
&.old .old_line, &.old .old_line,
...@@ -129,6 +131,11 @@ ...@@ -129,6 +131,11 @@
color: #ccc; color: #ccc;
background: #fafafa; background: #fafafa;
} }
&.parallel {
display: table-cell;
overflow: hidden;
width: 50%;
}
} }
} }
.image { .image {
...@@ -293,6 +300,7 @@ ...@@ -293,6 +300,7 @@
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -ms-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
ul, li{ ul, li{
...@@ -391,8 +399,8 @@ ...@@ -391,8 +399,8 @@
.commits-compare-switch{ .commits-compare-switch{
background: url("switch_icon.png") no-repeat center center; background: url("switch_icon.png") no-repeat center center;
width: 22px; width: 32px;
height: 22px; height: 32px;
text-indent: -9999px; text-indent: -9999px;
float: left; float: left;
margin-right: 9px; margin-right: 9px;
...@@ -474,8 +482,8 @@ li.commit { ...@@ -474,8 +482,8 @@ li.commit {
} }
.commit-row-message { .commit-row-message {
color: #555; color: #333;
font-weight: bolder; font-weight: 500;
&:hover { &:hover {
color: #444; color: #444;
text-decoration: underline; text-decoration: underline;
...@@ -484,13 +492,14 @@ li.commit { ...@@ -484,13 +492,14 @@ li.commit {
} }
.commit-row-info { .commit-row-info {
color: #777;
a { a {
color: #777; color: #777;
} }
.committed_ago { .committed_ago {
float: right; float: right;
@extend .cgray;
} }
} }
......
.dashboard { .dashboard {
@extend .row;
.activities {
}
.side { .side {
@extend .pull-right;
.ui-box { .ui-box {
margin: 0px; margin: 0px;
box-shadow: none; box-shadow: none;
...@@ -20,7 +14,7 @@ ...@@ -20,7 +14,7 @@
.search-text-input { .search-text-input {
float:left; float:left;
@extend .span2; @extend .col-md-2;
} }
.btn { .btn {
margin-left: 5px; margin-left: 5px;
...@@ -32,14 +26,15 @@ ...@@ -32,14 +26,15 @@
.dash-filter { .dash-filter {
margin: 7px 0; margin: 7px 0;
padding: 4px 6px; padding: 4px 6px;
width: 202px; width: 220px;
float: left; float: left;
height: inherit;
} }
} }
@media (max-width: 1200px) { @media (max-width: 1200px) {
.dashboard .dash-filter { .dashboard .dash-filter {
width: 132px; width: 150px;
} }
} }
...@@ -51,7 +46,7 @@ ...@@ -51,7 +46,7 @@
li { li {
&.active { &.active {
a { a {
@include linear-gradient(#f5f5f5, #eee); background-color: #EEE;
border-bottom: 1px solid #EEE !important; border-bottom: 1px solid #EEE !important;
&:hover { &:hover {
background: #eee; background: #eee;
...@@ -66,37 +61,58 @@ ...@@ -66,37 +61,58 @@
} }
.project-row, .group-row { .project-row, .group-row {
padding: 10px 15px !important; padding: 10px 12px !important;
font-size: 14px;
line-height: 24px;
.namespace-name { a {
color: #666; display: block;
font-weight: bold;
} }
.project-name, .group-name { .project-name, .group-name {
font-size: 15px; font-weight: 500;
} }
.arrow { .arrow {
float: right; float: right;
padding: 10px 5px; padding: 0px 5px;
margin: 0; margin: 0;
font-size: 20px; font-size: 20px;
color: #666; color: #666;
} }
.last-activity { .last-activity {
float: right;
font-size: 12px;
color: #AAA; color: #AAA;
display: block; display: block;
margin-top: 5px;
.date { .date {
color: #777; color: #777;
} }
} }
} }
.group-row { .project-access-icon {
.arrow { margin-left: 10px;
padding: 2px 5px; float: left;
margin-right: 15px;
font-size: 20px;
margin-bottom: 15px;
border: 1px solid #EEE;
padding: 8px 12px;
border-radius: 50px;
background: #f5f5f5;
text-align: center;
i {
color: #BBB;
} }
} }
.dash-project-access-icon {
float: left;
margin-right: 3px;
color: #999;
margin-bottom: 10px;
width: 16px;
}
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
line-height: 20px; line-height: 20px;
} }
textarea { textarea {
@extend .span8; @extend .col-md-8;
} }
} }
} }
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
margin-top: 4px; margin-top: 4px;
margin-left: 0px; margin-left: 0px;
max-width: 200px; max-width: 200px;
float: none;
} }
p:last-child { p:last-child {
...@@ -147,7 +148,7 @@ ...@@ -147,7 +148,7 @@
float: left; float: left;
padding: 9px 6px; padding: 9px 6px;
font-size: 18px; font-size: 18px;
width: 26px; width: 40px;
@include border-radius(3px); @include border-radius(3px);
} }
......
...@@ -4,17 +4,24 @@ ...@@ -4,17 +4,24 @@
*/ */
header { header {
&.navbar-gitlab { &.navbar-gitlab {
margin-bottom: 0;
min-height: 40px;
.navbar-inner { .navbar-inner {
height: 40px;
padding: 3px;
background: #F1F1F1; background: #F1F1F1;
border-bottom: 1px solid #DDD;
filter: none; filter: none;
.nav > li > a { .nav > li > a {
color: $style_color; color: $style_color;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
font-size: 14px; font-size: 14px;
padding: 10px; line-height: 32px;
padding: 6px 10px;
&:hover {
background: none;
}
} }
/** NAV block with links and profile **/ /** NAV block with links and profile **/
...@@ -35,9 +42,6 @@ header { ...@@ -35,9 +42,6 @@ header {
.app_logo { .app_logo {
float: left; float: left;
margin-right: 9px; margin-right: 9px;
position: relative;
top: -5px;
padding-top: 5px;
a { a {
float: left; float: left;
...@@ -46,10 +50,10 @@ header { ...@@ -46,10 +50,10 @@ header {
h1 { h1 {
margin: 0; margin: 0;
background: url('logo-black.png') no-repeat center 1px; background: url('logo-black.png') no-repeat center center;
background-size: 38px; background-size: 32px;
float: left; float: left;
height: 40px; height: 46px;
width: 40px; width: 40px;
@include header-font; @include header-font;
text-indent: -9999px; text-indent: -9999px;
...@@ -75,7 +79,7 @@ header { ...@@ -75,7 +79,7 @@ header {
.profile-pic { .profile-pic {
position: relative; position: relative;
top: -4px; top: -1px;
img { img {
width: 26px; width: 26px;
height: 26px; height: 26px;
...@@ -91,21 +95,25 @@ header { ...@@ -91,21 +95,25 @@ header {
.search { .search {
margin-right: 10px; margin-right: 10px;
margin-left: 10px; margin-left: 10px;
margin-top: 8px;
form {
margin: 0;
padding: 0;
}
.search-input { .search-input {
@extend .span3;
background-image: url("icon-search.png"); background-image: url("icon-search.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 10px; background-position: 10px;
height: inherit;
padding: 4px 6px;
padding-left: 25px; padding-left: 25px;
font-size: 13px; font-size: 13px;
@include border-radius(3px); @include border-radius(3px);
border: 1px solid #c6c6c6; border: 1px solid #c6c6c6;
box-shadow: none; box-shadow: none;
@include transition(all 0.15s ease-in 0s); @include transition(all 0.15s ease-in 0s);
&:focus {
@extend .span4;
}
} }
} }
...@@ -152,8 +160,8 @@ header { ...@@ -152,8 +160,8 @@ header {
.app_logo { .app_logo {
a { a {
h1 { h1 {
background: url('logo-white.png') no-repeat center 1px; background: url('logo-white.png') no-repeat center center;
background-size: 38px; background-size: 32px;
color: #fff; color: #fff;
text-shadow: 0 1px 1px #444; text-shadow: 0 1px 1px #444;
} }
...@@ -181,12 +189,26 @@ header { ...@@ -181,12 +189,26 @@ header {
.separator { .separator {
float: left; float: left;
height: 46px; height: 46px;
width: 1px; width: 2px;
background: white; background: white;
border-left: 1px solid #DDD; border-left: 1px solid #DDD;
margin-top: -3px;
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
} }
} }
.search .search-input {
width: 300px;
&:focus {
width: 400px;
}
}
@media (max-width: 1200px) {
.search .search-input {
width: 200px;
&:focus {
width: 300px;
}
}
}
...@@ -77,8 +77,8 @@ input.check_all_issues { ...@@ -77,8 +77,8 @@ input.check_all_issues {
@media (min-width: 800px) { .issues_filters select { width: 160px; } } @media (min-width: 800px) { .issues_filters select { width: 160px; } }
@media (min-width: 1200px) { .issues_filters select { width: 220px; } } @media (min-width: 1200px) { .issues_filters select { width: 220px; } }
@media (min-width: 800px) { .issues_bulk_update select { width: 120px; } } @media (min-width: 800px) { .issues_bulk_update .chosen-container { min-width: 120px; } }
@media (min-width: 1200px) { .issues_bulk_update select { width: 160px; } } @media (min-width: 1200px) { .issues_bulk_update .chosen-container { min-width: 160px; } }
.issues-holder { .issues-holder {
.issues_filters { .issues_filters {
...@@ -103,3 +103,27 @@ input.check_all_issues { ...@@ -103,3 +103,27 @@ input.check_all_issues {
.participants { .participants {
margin-bottom: 10px; margin-bottom: 10px;
} }
.issues_bulk_update {
.chosen-container {
text-shadow: none;
}
}
.issue-search-form {
margin: 0;
height: 24px;
.issue_search {
border: 1px solid #DDD !important;
background-color: #f4f4f4;
}
}
.issue-show-labels .label {
padding: 6px 10px;
}
form.edit-issue {
margin: 0;
}
/* Login Page */ /* Login Page */
body.login-page{ .login-page {
.container > .content { h1 {
padding-top: 20px; font-size: 3em;
font-weight: 200;
} }
}
.login-box{ .login-box{
width: 304px; width: 304px;
position: relative; position: relative;
@include border-radius(5px); @include border-radius(5px);
margin: auto; margin: auto;
padding: 20px; padding: 20px;
background: white; background: white;
} }
.login-box .login-logo{ .login-logo{
margin: 10px 0 30px 0; margin: 10px 0 30px 0;
display: block; display: block;
} }
.login-box input.text{background-color: #f1f1f1; font-size: 16px; @include border-radius(0); padding: 14px 10px; width: 280px} .form-control {
background-color: #f1f1f1;
font-size: 16px;
padding: 14px 10px;
width: 280px;
height: auto;
.login-box input.text.top{ &.top {
@include border-radius(5px 5px 0 0); @include border-radius(5px 5px 0 0);
margin-bottom: 0px; margin-bottom: 0px;
} }
.login-box input.text.bottom{ &.bottom {
@include border-radius(0 0 5px 5px); @include border-radius(0 0 5px 5px);
border-top: 0; border-top: 0;
margin-bottom: 20px; margin-bottom: 20px;
} }
.login-box input.text.middle{ &.middle {
border-top: 0; border-top: 0;
margin-bottom:0px; margin-bottom:0px;
} @include border-radius(0);
}
.login-box a.forgot{float: right; padding-top: 6px} }
.remember_me { .login-box a.forgot {
text-align: left; float: right;
padding-top: 6px
}
input { .devise-errors {
margin: 2px; h2 {
font-size: 14px;
color: #a00;
}
} }
} }
...@@ -15,29 +15,9 @@ ...@@ -15,29 +15,9 @@
} }
} }
.accept_group { .accept-group {
float: left;
border: 1px solid #ADA;
padding: 2px;
@include border-radius(5px);
background: #CEB;
.accept_merge_request {
font-size: 13px;
float: left;
}
.remove_branch_holder {
margin-left: 20px;
margin-right: 10px;
float: left;
}
label {
color: #444;
text-align: left
}
} }
.how_to_merge_link { .how_to_merge_link {
@extend .primary; @extend .primary;
} }
...@@ -110,9 +90,24 @@ ...@@ -110,9 +90,24 @@
.merge-request-angle { .merge-request-angle {
text-align: center; text-align: center;
margin: 0; margin: 0 auto;
font-size: 2em;
line-height: 1.1;
} }
.merge-request-form-info { .merge-request-form-info {
padding: 15px 0; padding-top: 15px;
}
.merge-request-branches {
.commit-row-message {
font-weight: normal !important;
}
.chosen-container .chosen-single {
span {
font-weight: bold;
color: #555;
}
}
} }
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
border-bottom: 1px solid #E1E1E1; border-bottom: 1px solid #E1E1E1;
ul { ul {
padding: 0;
margin: auto; margin: auto;
height: 40px; height: 40px;
overflow: hidden; overflow: hidden;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Notes * Notes
*/ */
@-webkit-keyframes target-note { @-webkit-keyframes targe3-note {
from { background:#fffff0; } from { background:#fffff0; }
50% { background:#ffffd3; } 50% { background:#ffffd3; }
to { background:#fffff0; } to { background:#fffff0; }
...@@ -119,9 +119,9 @@ ul.notes { ...@@ -119,9 +119,9 @@ ul.notes {
} }
.file .notes_holder { .file .notes_holder {
font-family: $sansFontFamily;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
td { td {
border: 1px solid #ddd; border: 1px solid #ddd;
...@@ -130,9 +130,15 @@ ul.notes { ...@@ -130,9 +130,15 @@ ul.notes {
&.notes_line { &.notes_line {
text-align: center; text-align: center;
padding: 10px 0; padding: 10px 0;
background: #eee;
}
&.notes_line2 {
text-align: center;
padding: 10px 0;
border-left: 1px solid #ddd !important;
} }
&.notes_content { &.notes_content {
background-color: $white; background-color: #fff;
border-width: 1px 0; border-width: 1px 0;
padding-top: 0; padding-top: 0;
...@@ -251,12 +257,12 @@ ul.notes { ...@@ -251,12 +257,12 @@ ul.notes {
.file, .file,
.discussion { .discussion {
.new_note { .new_note {
margin: 8px 5px 8px 0; margin: 0;
border: none;
} }
} }
.new_note { .new_note {
display: none; display: none;
.buttons { .buttons {
float: left; float: left;
margin-top: 8px; margin-top: 8px;
...@@ -270,10 +276,9 @@ ul.notes { ...@@ -270,10 +276,9 @@ ul.notes {
// preview/edit buttons // preview/edit buttons
> a { > a {
font-size: 24px;
padding: 4px;
position: absolute; position: absolute;
right: 10px; right: 5px;
bottom: -60px;
} }
.note_preview { .note_preview {
background: #f5f5f5; background: #f5f5f5;
...@@ -298,7 +303,7 @@ ul.notes { ...@@ -298,7 +303,7 @@ ul.notes {
} }
.note-image-attach { .note-image-attach {
@extend .span4; @extend .col-md-4;
@extend .thumbnail; @extend .thumbnail;
margin-left: 45px; margin-left: 45px;
} }
...@@ -306,10 +311,8 @@ ul.notes { ...@@ -306,10 +311,8 @@ ul.notes {
.common-note-form { .common-note-form {
margin: 0; margin: 0;
height: 140px;
background: #F9F9F9; background: #F9F9F9;
padding: 3px; padding: 3px;
padding-bottom: 25px;
border: 1px solid #DDD; border: 1px solid #DDD;
} }
...@@ -320,7 +323,7 @@ ul.notes { ...@@ -320,7 +323,7 @@ ul.notes {
padding: 0 5px; padding: 0 5px;
.note-form-option { .note-form-option {
margin-top: 10px; margin-top: 8px;
margin-left: 30px; margin-left: 30px;
@extend .pull-left; @extend .pull-left;
} }
...@@ -358,3 +361,7 @@ ul.notes { ...@@ -358,3 +361,7 @@ ul.notes {
.js-note-attachment-delete { .js-note-attachment-delete {
display: none; display: none;
} }
.parallel-comment {
padding: 6px;
}
.update-notifications { .update-notifications {
margin-bottom: 0; .radio-inline {
label { margin-right: 30px;
margin-bottom: 0;
} }
} }
...@@ -17,7 +16,7 @@ ...@@ -17,7 +16,7 @@
legend { legend {
border: none; border: none;
margin: 0; margin-bottom: 10px;
} }
} }
} }
...@@ -42,3 +41,8 @@ ...@@ -42,3 +41,8 @@
margin-right: 12px; margin-right: 12px;
} }
.profile-avatar-form-option {
hr {
margin: 10px 0;
}
}
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
th { th {
font-weight: normal; font-weight: normal;
font-size: 15px; font-size: 15px;
border-bottom: 1px solid #CCC; border-bottom: 1px solid #CCC !important;
} }
td { td {
border-color: #F1F1F1; border-color: #F1F1F1 !important;
} }
&:hover { &:hover {
td { td {
...@@ -111,5 +111,16 @@ ...@@ -111,5 +111,16 @@
.tree-ref-holder { .tree-ref-holder {
float: left; float: left;
margin-top: 5px; margin-top: 8px;
}
.readme-holder {
border-top: 1px dashed #CCC;
padding-top: 10px;
h4 {
font-size: 14px;
margin-bottom: 20px;
color: #777;
}
} }
...@@ -36,3 +36,8 @@ ...@@ -36,3 +36,8 @@
display: inline-block; display: inline-block;
margin: 0 8px; margin: 0 8px;
} }
.votes-holder {
float: right;
width: 250px;
}
.wall-page { .wall-page {
.wall-note-form { .wall-note-form {
@extend .span12; @extend .col-md-12;
margin: 0; margin: 0;
height: 140px; height: 140px;
......
h3.page-title .edit-wiki-header { .title .edit-wiki-header {
width: 780px; width: 780px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
......
/* CHZN reset few styles */
.chosen-container-single .chosen-single {
background: #FFF;
border: 1px solid #bbb;
box-shadow: none;
}
.chosen-container-active .chosen-single {
background: #fff;
}
.ajax-users-select {
width: 400px;
&.input-large {
width: 210px;
}
}
.user-result {
.user-image {
float: left;
}
.user-name {
}
.user-username {
color: #999;
}
}
/** Branch/tag selector **/
.project-refs-form {
margin: 0;
span {
background:none !important;
position:static !important;
width:auto !important;
height:auto !important;
}
}
.project-refs-select {
width: 120px;
}
.project-refs-form .chosen-container {
position: relative;
top: 0;
left: 0;
margin-right: 10px;
.chosen-drop {
min-width: 400px;
.chosen-results {
max-height: 300px;
}
.chosen-search input {
min-width: 365px;
}
}
}
/** Fix for Search Dropdown Border **/
.chosen-container {
min-width: 100px;
.chosen-search {
input:focus {
@include box-shadow(none);
}
}
.chosen-drop {
margin: 7px 0;
min-width: 200px;
border: 1px solid #bbb;
@include border-radius(0);
.chosen-results {
margin-top: 5px;
max-height: 300px;
.group-result {
color: $style_color;
border-bottom: 1px solid #EEE;
padding: 8px;
}
.active-result {
@include border-radius(0);
&.highlighted {
background: $hover;
color: $style_color;
}
&.result-selected {
background: #EEE;
border-left: 4px solid #CCC;
}
}
}
.chosen-search {
@include bg-gray-gradient;
input {
min-width: 165px;
border-color: #CCC;
}
}
}
}
.chosen-container .chosen-single,
.chosen-container.chosen-with-drop .chosen-single {
@include bg-light-gray-gradient;
div {
background: transparent;
border-left: none;
}
span {
font-weight: normal;
}
}
/** Select2 styling **/
.select2-container .select2-choice {
background: #f1f1f1;
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, whitesmoke), to(#e1e1e1));
background-image: -webkit-linear-gradient(whitesmoke 6.6%, #e1e1e1);
background-image: -moz-linear-gradient(whitesmoke 6.6%, #e1e1e1);
background-image: -o-linear-gradient(whitesmoke 6.6%, #e1e1e1);
}
.select2-container .select2-choice div {
border: none;
background: none;
}
.select2-drop {
padding-top: 8px;
}
.select2-no-results, .select2-searching {
padding: 7px;
color: #666;
}
.chosen-container .chosen-single div b {
background-position-y: 0px !important;
}
.chosen-container .chosen-drop .chosen-search input {
background-position-y: -24px !important;
}
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment