diff options
Diffstat (limited to 'app/assets/stylesheets')
24 files changed, 157 insertions, 938 deletions
diff --git a/app/assets/stylesheets/base/gl_variables.scss b/app/assets/stylesheets/base/gl_variables.scss index ce82ad80318..17b5622d74a 100644 --- a/app/assets/stylesheets/base/gl_variables.scss +++ b/app/assets/stylesheets/base/gl_variables.scss @@ -1,5 +1,5 @@ // Override Bootstrap variables here (defaults from bootstrap-sass v3.3.3): - +// For all variables see https://github.com/twbs/bootstrap-sass/blob/master/templates/project/_bootstrap-variables.sass // // Variables // -------------------------------------------------- @@ -15,12 +15,6 @@ // $gray: lighten($gray-base, 33.5%) // #555 // $gray-light: lighten($gray-base, 46.7%) // #777 // $gray-lighter: lighten($gray-base, 93.5%) // #eee -$gray-base: #000; -$gray-darker: lighten($gray-base, 13.5%); // #222 -$gray-dark: #7b8a8b; // #333 -$gray: #95a5a6; // #555 -$gray-light: #b4bcc2; // #999 -$gray-lighter: #ecf0f1; // #eee $brand-primary: $gl-primary; $brand-success: $gl-success; @@ -31,68 +25,17 @@ $brand-danger: $gl-danger; //== Scaffolding // -//## Settings for some of the most global styles. - -//** Background color for `<body>`. -// $body-bg: #fff -//** Global text color on `<body>`. -$text-color: $brand-primary; - -//** Global textual link color. +$text-color: $gl-text-color; $link-color: $gl-link-color; -//** Link hover color set via `darken()` function. -// $link-hover-color: darken($link-color, 15%) -//** Link hover decoration. -// $link-hover-decoration: underline //== Typography // //## Font, line-height, and color for body text, headings, and more. -// $font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif -// $font-family-serif: Georgia, "Times New Roman", Times, serif -//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`. -// $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace -// $font-family-base: $font-family-sans-serif - -$font-size-base: $gl-font-size; -// $font-size-large: ceil(($font-size-base * 1.25)) // ~18px -// $font-size-small: ceil(($font-size-base * 0.85)) // ~12px - -// $font-size-h1: floor(($font-size-base * 2.6)) // ~36px -// $font-size-h2: floor(($font-size-base * 2.15)) // ~30px -// $font-size-h3: ceil(($font-size-base * 1.7)) // ~24px -// $font-size-h4: ceil(($font-size-base * 1.25)) // ~18px -// $font-size-h5: $font-size-base -// $font-size-h6: ceil(($font-size-base * 0.85)) // ~12px - -//** Unit-less `line-height` for use in components like buttons. -// $line-height-base: 1.428571429 // 20/14 -//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc. -// $line-height-computed: floor(($font-size-base * $line-height-base)) // ~20px - -//** By default, this inherits from the `<body>`. -// $headings-font-family: inherit -// $headings-font-weight: 500 -// $headings-line-height: 1.1 -// $headings-color: inherit - - -//== Iconography -// -//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. - -//** Load fonts from this directory. - -// [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path. -// [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths. -// $icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") - -//** File name for all font files. -// $icon-font-name: "glyphicons-halflings-regular" -//** Element ID within SVG icon file. -// $icon-font-svg-id: "glyphicons_halflingsregular" +$font-family-sans-serif: $regular_font; +$font-family-monospace: $monospace_font; +$font-size-base: $gl-font-size; //== Components @@ -102,348 +45,15 @@ $font-size-base: $gl-font-size; $padding-base-vertical: 6px; $padding-base-horizontal: 14px; -// $padding-large-vertical: 10px -// $padding-large-horizontal: 16px - -// $padding-small-vertical: 5px -// $padding-small-horizontal: 10px - -// $padding-xs-vertical: 1px -// $padding-xs-horizontal: 5px - -// $line-height-large: 1.3333333 // extra decimals for Win 8.1 Chrome -// $line-height-small: 1.5 - -// $border-radius-base: 4px -// $border-radius-large: 6px -// $border-radius-small: 3px - -//** Global color for active items (e.g., navs or dropdowns). -// $component-active-color: #fff -//** Global background color for active items (e.g., navs or dropdowns). -// $component-active-bg: $brand-primary - -//** Width of the `border` for generating carets that indicator dropdowns. -// $caret-width-base: 4px -//** Carets increase slightly in size for larger components. -// $caret-width-large: 5px - - -//== Tables -// -//## Customizes the `.table` component with basic values, each used across all table variations. - -//** Padding for `<th>`s and `<td>`s. -// $table-cell-padding: 8px -//** Padding for cells in `.table-condensed`. -// $table-condensed-cell-padding: 5px - -//** Default background color used for all tables. -// $table-bg: transparent -//** Background color used for `.table-striped`. -// $table-bg-accent: #f9f9f9 -//** Background color used for `.table-hover`. -// $table-bg-hover: #f5f5f5 -// $table-bg-active: $table-bg-hover - -//** Border color for table and cell borders. -// $table-border-color: #ddd - - -//== Buttons -// -//## For each of Bootstrap's buttons, define text, background and border color. - -// $btn-font-weight: normal - -// $btn-default-color: #333 -// $btn-default-bg: #fff -// $btn-default-border: #ccc - -// $btn-primary-color: #fff -// $btn-primary-bg: $brand-primary -// $btn-primary-border: darken($btn-primary-bg, 5%) - -// $btn-success-color: #fff -// $btn-success-bg: $brand-success -// $btn-success-border: darken($btn-success-bg, 5%) - -// $btn-info-color: #fff -// $btn-info-bg: $brand-info -// $btn-info-border: darken($btn-info-bg, 5%) - -// $btn-warning-color: #fff -// $btn-warning-bg: $brand-warning -// $btn-warning-border: darken($btn-warning-bg, 5%) - -// $btn-danger-color: #fff -// $btn-danger-bg: $brand-danger -// $btn-danger-border: darken($btn-danger-bg, 5%) - -// $btn-link-disabled-color: $gray-light - //== Forms // //## -//** `<input>` background color -// $input-bg: #fff -//** `<input disabled>` background color -// $input-bg-disabled: $gray-lighter - -//** Text color for `<input>`s $input-color: $text-color; -//** `<input>` border color -$input-border: #dce4ec; - -// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4 -//** Default `.form-control` border radius -// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS. -// $input-border-radius: $border-radius-base -//** Large `.form-control` border radius -// $input-border-radius-large: $border-radius-large -//** Small `.form-control` border radius -// $input-border-radius-small: $border-radius-small - -//** Border color for inputs on focus +$input-border: #DDD; $input-border-focus: $brand-info; - -//** Placeholder text color -// $input-color-placeholder: #999 - -//** Default `.form-control` height -// $input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) -//** Large `.form-control` height -// $input-height-large: (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) -//** Small `.form-control` height -// $input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) - $legend-color: $text-color; -// $legend-border-color: #e5e5e5 - -//** Background color for textual input addons -// $input-group-addon-bg: $gray-lighter -//** Border color for textual input addons -// $input-group-addon-border-color: $input-border - -//** Disabled cursor for form controls and buttons. -// $cursor-disabled: not-allowed - - -//== Dropdowns -// -//## Dropdown menu container and contents. - -//** Background for the dropdown menu. -// $dropdown-bg: #fff -//** Dropdown menu `border-color`. -// $dropdown-border: rgba(0,0,0,.15) -//** Dropdown menu `border-color` **for IE8**. -// $dropdown-fallback-border: #ccc -//** Divider color for between dropdown items. -// $dropdown-divider-bg: #e5e5e5 - -//** Dropdown link text color. -// $dropdown-link-color: $gray-dark -//** Hover color for dropdown links. -// $dropdown-link-hover-color: darken($gray-dark, 5%) -//** Hover background for dropdown links. -// $dropdown-link-hover-bg: #f5f5f5 - -//** Active dropdown menu item text color. -// $dropdown-link-active-color: $component-active-color -//** Active dropdown menu item background color. -// $dropdown-link-active-bg: $component-active-bg - -//** Disabled dropdown menu item background color. -// $dropdown-link-disabled-color: $gray-light - -//** Text color for headers within dropdown menus. -// $dropdown-header-color: $gray-light - -//** Deprecated `$dropdown-caret-color` as of v3.1.0 -// $dropdown-caret-color: #000 - - -//-- Z-index master list -// -// Warning: Avoid customizing these values. They're used for a bird's eye view -// of components dependent on the z-axis and are designed to all work together. -// -// Note: These variables are not generated into the Customizer. - -// $zindex-navbar: 1000 -// $zindex-dropdown: 1000 -// $zindex-popover: 1060 -// $zindex-tooltip: 1070 -// $zindex-navbar-fixed: 1030 -// $zindex-modal: 1040 - - -//== Media queries breakpoints -// -//## Define the breakpoints at which your layout will change, adapting to different screen sizes. - -// Extra small screen / phone -//** Deprecated `$screen-xs` as of v3.0.1 -// $screen-xs: 480px -//** Deprecated `$screen-xs-min` as of v3.2.0 -// $screen-xs-min: $screen-xs -//** Deprecated `$screen-phone` as of v3.0.1 -// $screen-phone: $screen-xs-min - -// Small screen / tablet -//** Deprecated `$screen-sm` as of v3.0.1 -// $screen-sm: 768px -// $screen-sm-min: $screen-sm -//** Deprecated `$screen-tablet` as of v3.0.1 -// $screen-tablet: $screen-sm-min - -// Medium screen / desktop -//** Deprecated `$screen-md` as of v3.0.1 -// $screen-md: 992px -// $screen-md-min: $screen-md -//** Deprecated `$screen-desktop` as of v3.0.1 -// $screen-desktop: $screen-md-min - -// Large screen / wide desktop -//** Deprecated `$screen-lg` as of v3.0.1 -// $screen-lg: 1200px -// $screen-lg-min: $screen-lg -//** Deprecated `$screen-lg-desktop` as of v3.0.1 -// $screen-lg-desktop: $screen-lg-min - -// So media queries don't overlap when required, provide a maximum -// $screen-xs-max: ($screen-sm-min - 1) -// $screen-sm-max: ($screen-md-min - 1) -// $screen-md-max: ($screen-lg-min - 1) - - -//== Grid system -// -//## Define your custom responsive grid. - -//** Number of columns in the grid. -// $grid-columns: 12 -//** Padding between columns. Gets divided in half for the left and right. -// $grid-gutter-width: 30px -// Navbar collapse -//** Point at which the navbar becomes uncollapsed. -// $grid-float-breakpoint: $screen-sm-min -//** Point at which the navbar begins collapsing. -// $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) - - -//== Container sizes -// -//## Define the maximum width of `.container` for different screen sizes. - -// Small screen / tablet -// $container-tablet: (720px + $grid-gutter-width) -//** For `$screen-sm-min` and up. -// $container-sm: $container-tablet - -// Medium screen / desktop -// $container-desktop: (940px + $grid-gutter-width) -//** For `$screen-md-min` and up. -// $container-md: $container-desktop - -// Large screen / wide desktop -// $container-large-desktop: (1140px + $grid-gutter-width) -//** For `$screen-lg-min` and up. -// $container-lg: $container-large-desktop - - -//== Navbar -// -//## - -// Basics of a navbar -// $navbar-height: 50px -// $navbar-margin-bottom: $line-height-computed -// $navbar-border-radius: $border-radius-base -// $navbar-padding-horizontal: floor(($grid-gutter-width / 2)) -// $navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) -// $navbar-collapse-max-height: 340px - -// $navbar-default-color: #777 -// $navbar-default-bg: #f8f8f8 -// $navbar-default-border: darken($navbar-default-bg, 6.5%) - -// Navbar links -// $navbar-default-link-color: #777 -// $navbar-default-link-hover-color: #333 -// $navbar-default-link-hover-bg: transparent -// $navbar-default-link-active-color: #555 -// $navbar-default-link-active-bg: darken($navbar-default-bg, 6.5%) -// $navbar-default-link-disabled-color: #ccc -// $navbar-default-link-disabled-bg: transparent - -// Navbar brand label -// $navbar-default-brand-color: $navbar-default-link-color -// $navbar-default-brand-hover-color: darken($navbar-default-brand-color, 10%) -// $navbar-default-brand-hover-bg: transparent - -// Navbar toggle -// $navbar-default-toggle-hover-bg: #ddd -// $navbar-default-toggle-icon-bar-bg: #888 -// $navbar-default-toggle-border-color: #ddd - - -// Inverted navbar -// Reset inverted navbar basics -// $navbar-inverse-color: lighten($gray-light, 15%) -// $navbar-inverse-bg: #222 -// $navbar-inverse-border: darken($navbar-inverse-bg, 10%) - -// Inverted navbar links -// $navbar-inverse-link-color: lighten($gray-light, 15%) -// $navbar-inverse-link-hover-color: #fff -// $navbar-inverse-link-hover-bg: transparent -// $navbar-inverse-link-active-color: $navbar-inverse-link-hover-color -// $navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 10%) -// $navbar-inverse-link-disabled-color: #444 -// $navbar-inverse-link-disabled-bg: transparent - -// Inverted navbar brand label -// $navbar-inverse-brand-color: $navbar-inverse-link-color -// $navbar-inverse-brand-hover-color: #fff -// $navbar-inverse-brand-hover-bg: transparent - -// Inverted navbar toggle -// $navbar-inverse-toggle-hover-bg: #333 -// $navbar-inverse-toggle-icon-bar-bg: #fff -// $navbar-inverse-toggle-border-color: #333 - - -//== Navs -// -//## - -//=== Shared nav styles -// $nav-link-padding: 10px 15px -// $nav-link-hover-bg: $gray-lighter - -// $nav-disabled-link-color: $gray-light -// $nav-disabled-link-hover-color: $gray-light - -//== Tabs -// $nav-tabs-border-color: #ddd - -// $nav-tabs-link-hover-border-color: $gray-lighter - -// $nav-tabs-active-link-hover-bg: $body-bg -// $nav-tabs-active-link-hover-color: $gray -// $nav-tabs-active-link-hover-border-color: #ddd - -// $nav-tabs-justified-link-border-color: #ddd -// $nav-tabs-justified-active-link-border-color: $body-bg - -//== Pills -// $nav-pills-border-radius: $border-radius-base -// $nav-pills-active-link-hover-bg: $component-active-bg -// $nav-pills-active-link-hover-color: $component-active-color //== Pagination @@ -467,38 +77,10 @@ $pagination-disabled-bg: lighten($brand-success, 15%); $pagination-disabled-border: transparent; -//== Pager -// -//## - -// $pager-bg: $pagination-bg -// $pager-border: $pagination-border -// $pager-border-radius: 15px - -// $pager-hover-bg: $pagination-hover-bg - -// $pager-active-bg: $pagination-active-bg -// $pager-active-color: $pagination-active-color - -// $pager-disabled-color: $pagination-disabled-color - - -//== Jumbotron -// -//## - -// $jumbotron-padding: 30px -// $jumbotron-color: inherit -// $jumbotron-bg: $gray-lighter -// $jumbotron-heading-color: inherit -// $jumbotron-font-size: ceil(($font-size-base * 1.5)) - - //== Form states and alerts // //## Define colors for form feedback states and, by default, alerts. - $state-success-text: #fff; $state-success-bg: $brand-success; $state-success-border: $brand-success; @@ -516,316 +98,22 @@ $state-danger-bg: $brand-danger; $state-danger-border: $brand-danger; -//== Tooltips -// -//## - -//** Tooltip max width -// $tooltip-max-width: 200px -//** Tooltip text color -// $tooltip-color: #fff -//** Tooltip background color -// $tooltip-bg: #000 -// $tooltip-opacity: .9 - -//** Tooltip arrow width -// $tooltip-arrow-width: 5px -//** Tooltip arrow color -// $tooltip-arrow-color: $tooltip-bg - - -//== Popovers -// -//## - -//** Popover body background color -// $popover-bg: #fff -//** Popover maximum width -// $popover-max-width: 276px -//** Popover border color -// $popover-border-color: rgba(0,0,0,.2) -//** Popover fallback border color -// $popover-fallback-border-color: #ccc - -//** Popover title background color -// $popover-title-bg: darken($popover-bg, 3%) - -//** Popover arrow width -// $popover-arrow-width: 10px -//** Popover arrow color -// $popover-arrow-color: $popover-bg - -//** Popover outer arrow width -// $popover-arrow-outer-width: ($popover-arrow-width + 1) -//** Popover outer arrow color -// $popover-arrow-outer-color: fade_in($popover-border-color, 0.05) -//** Popover outer arrow fallback color -// $popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%) - - -//== Labels -// -//## - -//** Default label background color -// $label-default-bg: $gray-light -//** Primary label background color -// $label-primary-bg: $brand-primary -//** Success label background color -// $label-success-bg: $brand-success -//** Info label background color -// $label-info-bg: $brand-info -//** Warning label background color -// $label-warning-bg: $brand-warning -//** Danger label background color -// $label-danger-bg: $brand-danger - -//** Default label text color -// $label-color: #fff -//** Default text color of a linked label -// $label-link-hover-color: #fff - - -//== Modals -// -//## - -//** Padding applied to the modal body -// $modal-inner-padding: 15px - -//** Padding applied to the modal title -// $modal-title-padding: 15px -//** Modal title line-height -// $modal-title-line-height: $line-height-base - -//** Background color of modal content area -// $modal-content-bg: #fff -//** Modal content border color -// $modal-content-border-color: rgba(0,0,0,.2) -//** Modal content border color **for IE8** -// $modal-content-fallback-border-color: #999 - -//** Modal backdrop background color -// $modal-backdrop-bg: #000 -//** Modal backdrop opacity -// $modal-backdrop-opacity: .5 -//** Modal header border color -// $modal-header-border-color: #e5e5e5 -//** Modal footer border color -// $modal-footer-border-color: $modal-header-border-color - -// $modal-lg: 900px -// $modal-md: 600px -// $modal-sm: 300px - - //== Alerts // //## Define alert colors, border radius, and padding. -// $alert-padding: 15px $alert-border-radius: 0; -// $alert-link-font-weight: bold - -// $alert-success-bg: $state-success-bg -// $alert-success-text: $state-success-text -// $alert-success-border: $state-success-border - -// $alert-info-bg: $state-info-bg -// $alert-info-text: $state-info-text -// $alert-info-border: $state-info-border - -// $alert-warning-bg: $state-warning-bg -// $alert-warning-text: $state-warning-text -// $alert-warning-border: $state-warning-border - -// $alert-danger-bg: $state-danger-bg -// $alert-danger-text: $state-danger-text -// $alert-danger-border: $state-danger-border - - -//== Progress bars -// -//## - -//** Background color of the whole progress component -// $progress-bg: #f5f5f5 -//** Progress bar text color -// $progress-bar-color: #fff -//** Variable for setting rounded corners on progress bar. -// $progress-border-radius: $border-radius-base - -//** Default progress bar color -// $progress-bar-bg: $brand-primary -//** Success progress bar color -// $progress-bar-success-bg: $brand-success -//** Warning progress bar color -// $progress-bar-warning-bg: $brand-warning -//** Danger progress bar color -// $progress-bar-danger-bg: $brand-danger -//** Info progress bar color -// $progress-bar-info-bg: $brand-info - - -//== List group -// -//## - -//** Background color on `.list-group-item` -// $list-group-bg: #fff -//** `.list-group-item` border color -// $list-group-border: #ddd -//** List group border radius -// $list-group-border-radius: $border-radius-base - -//** Background color of single list items on hover -// $list-group-hover-bg: #f5f5f5 -//** Text color of active list items -// $list-group-active-color: $component-active-color -//** Background color of active list items -// $list-group-active-bg: $component-active-bg -//** Border color of active list elements -// $list-group-active-border: $list-group-active-bg -//** Text color for content within active list items -// $list-group-active-text-color: lighten($list-group-active-bg, 40%) - -//** Text color of disabled list items -// $list-group-disabled-color: $gray-light -//** Background color of disabled list items -// $list-group-disabled-bg: $gray-lighter -//** Text color for content within disabled list items -// $list-group-disabled-text-color: $list-group-disabled-color - -// $list-group-link-color: #555 -// $list-group-link-hover-color: $list-group-link-color -// $list-group-link-heading-color: #333 //== Panels // //## -// $panel-bg: #fff -// $panel-body-padding: 15px -// $panel-heading-padding: 10px 15px -// $panel-footer-padding: $panel-heading-padding $panel-border-radius: 0; - -//** Border color for elements within panels -// $panel-inner-border: #ddd -// $panel-footer-bg: #f5f5f5 - $panel-default-text: $text-color; $panel-default-border: $border-color; $panel-default-heading-bg: $background-color; -// $panel-primary-text: #fff -// $panel-primary-border: $brand-primary -// $panel-primary-heading-bg: $brand-primary - -// $panel-success-text: $state-success-text -// $panel-success-border: $state-success-border -// $panel-success-heading-bg: $state-success-bg - -// $panel-info-text: $state-info-text -// $panel-info-border: $state-info-border -// $panel-info-heading-bg: $state-info-bg - -// $panel-warning-text: $state-warning-text -// $panel-warning-border: $state-warning-border -// $panel-warning-heading-bg: $state-warning-bg - -// $panel-danger-text: $state-danger-text -// $panel-danger-border: $state-danger-border -// $panel-danger-heading-bg: $state-danger-bg - - -//== Thumbnails -// -//## - -//** Padding around the thumbnail image -// $thumbnail-padding: 4px -//** Thumbnail background color -// $thumbnail-bg: $body-bg -//** Thumbnail border color -// $thumbnail-border: #ddd -//** Thumbnail border radius -// $thumbnail-border-radius: $border-radius-base - -//** Custom text color for thumbnail captions -// $thumbnail-caption-color: $text-color -//** Padding around the thumbnail caption -// $thumbnail-caption-padding: 9px - - -//== Wells -// -//## - -$well-bg: $gray-lighter; -$well-border: transparent; - - -//== Badges -// -//## - -// $badge-color: #fff -//** Linked badge text color on hover -// $badge-link-hover-color: #fff -// $badge-bg: $gray-light - -//** Badge text color in active nav link -// $badge-active-color: $link-color -//** Badge background color in active nav link -// $badge-active-bg: #fff - -// $badge-font-weight: bold -// $badge-line-height: 1 -// $badge-border-radius: 10px - - -//== Breadcrumbs -// -//## - -// $breadcrumb-padding-vertical: 8px -// $breadcrumb-padding-horizontal: 15px -//** Breadcrumb background color -// $breadcrumb-bg: #f5f5f5 -//** Breadcrumb text color -// $breadcrumb-color: #ccc -//** Text color of current page in the breadcrumb -// $breadcrumb-active-color: $gray-light -//** Textual separator for between breadcrumb elements -// $breadcrumb-separator: "/" - - -//== Carousel -// -//## - -// $carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) - -// $carousel-control-color: #fff -// $carousel-control-width: 15% -// $carousel-control-opacity: .5 -// $carousel-control-font-size: 20px - -// $carousel-indicator-active-bg: #fff -// $carousel-indicator-border-color: #fff - -// $carousel-caption-color: #fff - - -//== Close -// -//## - -// $close-font-weight: bold -// $close-color: #000 -// $close-text-shadow: 0 1px 0 #fff //== Code @@ -837,34 +125,3 @@ $code-bg: #f9f2f4; $kbd-color: #fff; $kbd-bg: #333; - -$pre-bg: $gray-lighter; -$pre-color: $text-color; -$pre-border-color: #ccc; -// $pre-scrollable-max-height: 340px - - -//== Type -// -//## - -//** Horizontal offset for forms and lists. -// $component-offset-horizontal: 180px -//** Text muted color -// $text-muted: $gray-light -//** Abbreviations and acronyms border color -// $abbr-border-color: $gray-light -//** Headings small color -$headings-small-color: $gray-dark; -//** Blockquote small color -// $blockquote-small-color: $gray-light -//** Blockquote font size -// $blockquote-font-size: ($font-size-base * 1.25) -//** Blockquote border color -// $blockquote-border-color: $gray-lighter -//** Page header border color -// $page-header-border-color: $gray-lighter -//** Width of horizontal description list titles -// $dl-horizontal-offset: $component-offset-horizontal -//** Horizontal line color. -// $hr-border: $gray-lighter diff --git a/app/assets/stylesheets/base/variables.scss b/app/assets/stylesheets/base/variables.scss index 4e2c64aa132..596376c3970 100644 --- a/app/assets/stylesheets/base/variables.scss +++ b/app/assets/stylesheets/base/variables.scss @@ -1,5 +1,6 @@ $style_color: #474D57; $hover: #FFF3EB; +$gl-text-color: #222222; $gl-link-color: #446e9b; $nprogress-color: #c0392b; $gl-font-size: 14px; @@ -8,23 +9,18 @@ $sidebar_width: 230px; $avatar_radius: 50%; $code_font_size: 13px; $code_line_height: 1.5; -$border-color: #dce4ec; -$background-color: #ECF0F1; +$border-color: #E5E5E5; +$background-color: #f5f5f5; /* * State colors: */ -$gl-success: #019875; -$gl-danger: #d9534f; $gl-primary: #446e9b; +$gl-success: #019875; $gl-info: #029ACF; $gl-warning: #EB9532; +$gl-danger: #d9534f; -$gl-primary: #2C3E50; -$gl-success: #18BC9C; -$gl-info: #3498DB; -$gl-warning: #F39C12; -$gl-danger: #E74C3C; /* * Commit Diff Colors */ diff --git a/app/assets/stylesheets/generic/calendar.scss b/app/assets/stylesheets/generic/calendar.scss index 9483b26164e..e2ab7fc51a5 100644 --- a/app/assets/stylesheets/generic/calendar.scss +++ b/app/assets/stylesheets/generic/calendar.scss @@ -1,29 +1,45 @@ -.calendar_onclick_placeholder { - padding: 0 0 2px 0; -} - -.calendar_commit_activity { - padding: 5px 0 0; -} - -.calendar_onclick_second { - font-size: 14px; - display: block; -} - -.calendar_onclick_hr { - padding: 0; - margin: 10px 0; -} +.user-calendar-activities { + + .calendar_commit_activity { + padding: 5px 0 0; + } + + .calendar_onclick_hr { + padding: 0; + margin: 10px 0; + } + + .calendar_commit_date { + color: #999; + } + + .calendar_activity_summary { + font-size: 14px; + } -.calendar_commit_date { - color: #999; -} + .str-truncated { + max-width: 70%; + } -.calendar_activity_summary { - font-size: 14px; + .text-expander { + background: #eee; + color: #555; + padding: 0 5px; + cursor: pointer; + margin-left: 4px; + &:hover { + background-color: #ddd; + } + } + + .commit-row-message { + color: #333; + &:hover { + color: #444; + text-decoration: underline; + } + } } - /** * This overwrites the default values of the cal-heatmap gem */ diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss index 876eea72e8a..db393e08819 100644 --- a/app/assets/stylesheets/generic/common.scss +++ b/app/assets/stylesheets/generic/common.scss @@ -355,3 +355,22 @@ table { bottom: 20px !important; left: 20px !important; } + +.header-with-avatar { + h3 { + margin: 0; + font-weight: bold; + } + + .username { + font-size: 18px; + color: #666; + margin-top: 8px; + } + + .description { + font-size: 16px; + color: #666; + margin-top: 8px; + } +} diff --git a/app/assets/stylesheets/generic/files.scss b/app/assets/stylesheets/generic/files.scss index 91220a856ac..8014dcb165b 100644 --- a/app/assets/stylesheets/generic/files.scss +++ b/app/assets/stylesheets/generic/files.scss @@ -94,7 +94,7 @@ } .author, .blame_commit { - background: #f5f5f5; + background: $background-color; vertical-align: top; } .lines { diff --git a/app/assets/stylesheets/generic/forms.scss b/app/assets/stylesheets/generic/forms.scss index 19bc11086e9..31fe5a03f37 100644 --- a/app/assets/stylesheets/generic/forms.scss +++ b/app/assets/stylesheets/generic/forms.scss @@ -29,8 +29,8 @@ fieldset legend { padding: 17px 20px 18px; margin-top: 18px; margin-bottom: 18px; - background-color: #ecf0f1; - border-top: 1px solid #e5e5e5; + background-color: $background-color; + border-top: 1px solid $border-color; } @media (min-width: $screen-sm-min) { diff --git a/app/assets/stylesheets/generic/lists.scss b/app/assets/stylesheets/generic/lists.scss index 5950885c42c..08bf6e943d2 100644 --- a/app/assets/stylesheets/generic/lists.scss +++ b/app/assets/stylesheets/generic/lists.scss @@ -35,7 +35,7 @@ color: #8a6d3b; } - &.smoke { background-color: #f5f5f5; } + &.smoke { background-color: $background-color; } &:hover { background: $hover; @@ -46,7 +46,7 @@ border-bottom: none; &.bottom { - background: #f5f5f5; + background: $background-color; } } @@ -61,7 +61,7 @@ p { padding-top: 1px; margin: 0; - color: #222; + color: $gray-dark; img { position: relative; top: 3px; @@ -74,9 +74,10 @@ } .row_title { - color: #444; + color: $gray-dark; + &:hover { - color: #444; + color: $text-color; text-decoration: underline; } } diff --git a/app/assets/stylesheets/generic/nav_sidebar.scss b/app/assets/stylesheets/generic/nav_sidebar.scss index c14f12284da..3bcb7b81333 100644 --- a/app/assets/stylesheets/generic/nav_sidebar.scss +++ b/app/assets/stylesheets/generic/nav_sidebar.scss @@ -1,18 +1,18 @@ .page-with-sidebar { - background: #F5F5F5; + background: $background-color; .sidebar-wrapper { position: fixed; top: 0; left: 0; height: 100%; - border-right: 1px solid #EAEAEA; + border-right: 1px solid $border-color; } } .sidebar-wrapper { z-index: 99; - background: #F5F5F5; + background: $background-color; } .content-wrapper { @@ -39,7 +39,7 @@ .nav-sidebar li { &.active a { - color: #333; + color: $text-color; background: #FFF !important; font-weight: bold; border: 1px solid #EEE; @@ -52,32 +52,31 @@ } i { - color: #444; + color: $text-color; } } } .nav-sidebar li { &.separate-item { - border-top: 1px solid #ddd; + border-top: 1px solid $border-color; padding-top: 10px; margin-top: 10px; } a { - color: #555; + color: $gray; display: block; text-decoration: none; padding: 8px 15px; font-size: 13px; line-height: 20px; - text-shadow: 0 1px 2px #FFF; padding-left: 20px; &:hover { text-decoration: none; - color: #333; - background: #EEE; + color: $text-color; + background: $border-color; } &:active, &:focus { @@ -86,7 +85,7 @@ i { width: 20px; - color: #888; + color: $gray-light; margin-right: 23px; } } @@ -156,18 +155,17 @@ position: fixed; top: 46px; padding: 5px 13px 5px 13px; - left: 197px; + left: 198px; font-size: 13px; - background: #EEE; + background: transparent; color: black; - border-left: 1px solid rgba(0,0,0,0.035); - border-right: 1px solid rgba(0,0,0,0.035); + border-left: 1px solid $border-color; + border-bottom: 1px solid $border-color; } .collapse-nav a:hover { text-decoration: none; - color: #333; - background: #eaeaea; + background: #f2f6f7; } @media (max-width: $screen-md-max) { diff --git a/app/assets/stylesheets/generic/selects.scss b/app/assets/stylesheets/generic/selects.scss index c13a685a528..7557f411111 100644 --- a/app/assets/stylesheets/generic/selects.scss +++ b/app/assets/stylesheets/generic/selects.scss @@ -46,55 +46,13 @@ } } -select { - &.select2 { - width: 100px; - } - - &.select2-sm { - width: 100px; - } -} - -@media (min-width: $screen-sm-min) { - select { - &.select2 { - width: 150px; - } - &.select2-sm { - width: 120px; - } - } +.select2-container { + width: 100% !important; } -/* Medium devices (desktops, 992px and up) */ -@media (min-width: $screen-md-min) { - select { - &.select2 { - width: 170px; - } - &.select2-sm { - width: 140px; - } - } -} - -/* Large devices (large desktops, 1200px and up) */ -@media (min-width: $screen-lg-min) { - select { - &.select2 { - width: 200px; - } - &.select2-sm { - width: 150px; - } - } -} - - /** Branch/tag selector **/ .project-refs-form .select2-container { - margin-right: 10px; + width: 160px !important; } .ajax-users-dropdown, .ajax-project-users-dropdown { diff --git a/app/assets/stylesheets/generic/timeline.scss b/app/assets/stylesheets/generic/timeline.scss index f92a79f7a5f..97831eb7c27 100644 --- a/app/assets/stylesheets/generic/timeline.scss +++ b/app/assets/stylesheets/generic/timeline.scss @@ -54,7 +54,7 @@ .timeline-content { position: relative; - background: #f5f5f6; + background: $background-color; padding: 10px 15px; margin-left: 60px; @@ -70,7 +70,7 @@ height: 0; border-style: solid; border-width: 9px 9px 9px 0; - border-color: transparent #f5f5f6 transparent transparent; + border-color: transparent $background-color transparent transparent; left: 0; top: 10px; margin-left: -9px; diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss index 4d940ee6b29..80190424c1b 100644 --- a/app/assets/stylesheets/generic/typography.scss +++ b/app/assets/stylesheets/generic/typography.scss @@ -4,7 +4,6 @@ */ .page-title { margin-top: 0px; - color: #333; line-height: 1.5; font-weight: normal; margin-bottom: 5px; @@ -16,7 +15,7 @@ pre { &.dark { background: #333; - color: #f5f5f5; + color: $background-color; } } diff --git a/app/assets/stylesheets/pages/dashboard.scss b/app/assets/stylesheets/pages/dashboard.scss index 5a543a852c2..af9c83e5dc8 100644 --- a/app/assets/stylesheets/pages/dashboard.scss +++ b/app/assets/stylesheets/pages/dashboard.scss @@ -28,6 +28,10 @@ font-size: 14px; line-height: 24px; + .str-truncated { + max-width: 72%; + } + a { display: block; padding: 8px 15px; @@ -87,16 +91,3 @@ margin-right: 5px; width: 16px; } - -.dash-new-project { - background: $gl-success; - border: 1px solid $gl-success; - - a { - color: #FFF; - } -} - -.dash-list .str-truncated { - max-width: 72%; -} diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 5a9f93dc03d..7b7bb88bc20 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -11,8 +11,10 @@ z-index: 10; > span { - @include str-truncated(65%); font-family: $monospace_font; + word-break: break-all; + margin-right: 200px; + display: block; } .diff-btn-group { @@ -89,7 +91,7 @@ margin: 0px; padding: 0px; border: none; - background: #F5F5F5; + background: $background-color; color: rgba(0,0,0,0.3); padding: 0px 5px; border-right: 1px solid $border-color; diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss index 851f126318d..759ba6b1c22 100644 --- a/app/assets/stylesheets/pages/editor.scss +++ b/app/assets/stylesheets/pages/editor.scss @@ -37,7 +37,7 @@ } .editor-ref { - background: #f5f5f5; + background: $background-color; padding: 11px 15px; border-right: 1px solid #CCC; display: inline-block; diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss index 3e9e36e477e..83daea10ed5 100644 --- a/app/assets/stylesheets/pages/events.scss +++ b/app/assets/stylesheets/pages/events.scss @@ -154,10 +154,12 @@ overflow: auto; .event-last-push-text { @include str-truncated(100%); + padding: 5px 0; + font-size: 13px; float:left; margin-right: -150px; padding-right: 150px; - line-height: 24px; + line-height: 20px; } } @@ -188,7 +190,7 @@ li a { font-size: 13px; padding: 5px 10px; - background: rgba(0,0,0,0.045); + background: $background-color; margin-left: 4px; } } diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss index e49fe1a9dd6..2b1b747139a 100644 --- a/app/assets/stylesheets/pages/groups.scss +++ b/app/assets/stylesheets/pages/groups.scss @@ -1,6 +1,5 @@ .new-group-member-holder { margin-top: 50px; - background: #f9f9f9; padding-top: 20px; } diff --git a/app/assets/stylesheets/pages/header.scss b/app/assets/stylesheets/pages/header.scss index 26b4d04106e..dde19b801f8 100644 --- a/app/assets/stylesheets/pages/header.scss +++ b/app/assets/stylesheets/pages/header.scss @@ -31,7 +31,7 @@ header { .navbar-toggle { color: $style_color; - margin: 0 -15px 0 0; + margin: 0; padding: 10px; border-radius: 0; diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index d8d12338859..a640a4e2051 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -25,7 +25,7 @@ } .issuable-context-title { - font-size: 15px; + font-size: 14px; line-height: 1.4; margin-bottom: 5px; @@ -39,3 +39,9 @@ margin-right: 4px; } } + +.issuable-affix .context { + font-size: 13px; + + .btn { font-size: 13px; } +} diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 4ea34cc1dac..6c1dd4f7e9f 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -59,33 +59,34 @@ } } -@media (min-width: 800px) { .issues_filters select { width: 160px; } } -@media (min-width: 1200px) { .issues_filters select { width: 220px; } } +@media (min-width: 800px) { + .issues_bulk_update { + select, .select2-container { + width: 120px !important; + display: inline-block; + } + } +} -@media (min-width: 800px) { .issues_bulk_update .select2-container { min-width: 120px; } } -@media (min-width: 1200px) { .issues_bulk_update .select2-container { min-width: 160px; } } +@media (min-width: 1200px) { + .issues_bulk_update { + select, .select2-container { + width: 160px !important; + display: inline-block; + } + } +} .issues_bulk_update { .select2-container .select2-choice { color: #444 !important; - font-weight: 500; } } -#update_status { - width: 100px; -} - .participants { margin-bottom: 20px; } -.issues_bulk_update { - .select2-container { - text-shadow: none; - } -} - .issue-search-form { margin: 0; height: 24px; @@ -177,6 +178,6 @@ h2.issue-title { font-weight: bold; } -.context .select2-container { - width: 100% !important; +.issue-form .select2-container { + width: 250px !important; } diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index d41e34caba1..d8fe339b7b3 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -129,7 +129,7 @@ font-size: 15px; border-bottom: 1px solid #BBB; color: #777; - background-color: #F5F5F5; + background-color: $background-color; &.ci-success { color: $gl-success; @@ -155,6 +155,12 @@ background-color: #FAF1F1; } + &.ci-canceled { + color: $gl-warning; + border-color: $gl-danger; + background-color: #FAF5F1; + } + &.ci-error { color: $gl-danger; border-color: $gl-danger; @@ -194,3 +200,7 @@ } } } + +.merge-request-form .select2-container { + width: 250px !important; +} diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 81afe05162f..fbe71a5b5ad 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -41,11 +41,6 @@ } } -.user-show-username { - font-weight: 200; - color: #666; -} - /* * Appearance settings * diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 74755951670..6d55a5fa66e 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -49,16 +49,20 @@ @extend .clearfix; margin-bottom: 15px; + .project-home-desc, + .star-fork-buttons { + font-size: 16px; + line-height: 1.3; + } + .project-home-desc { float: left; color: #666; - font-size: 16px; } .star-fork-buttons { float: right; min-width: 200px; - font-size: 14px; font-weight: bold; .star-buttons, .fork-buttons { diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index ce02cdb1652..57f63b52aa1 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -27,7 +27,7 @@ } &.selected { td { - background: #f5f5f5; + background: $background-color; border-top: 1px solid #EEE; border-bottom: 1px solid #EEE; } @@ -112,7 +112,7 @@ .tree-ref-holder { float: left; - margin-right: 6px; + margin-right: 15px; .select2-container .select2-choice, .select2-container.select2-drop-above .select2-choice { padding: 4px 12px; diff --git a/app/assets/stylesheets/pages/votes.scss b/app/assets/stylesheets/pages/votes.scss index ba0a519dca6..dc9a7d71e8b 100644 --- a/app/assets/stylesheets/pages/votes.scss +++ b/app/assets/stylesheets/pages/votes.scss @@ -1,39 +1,4 @@ -.votes { - font-size: 13px; - line-height: 15px; - .progress { - height: 4px; - margin: 0; - .bar { - float: left; - height: 100%; - } - .bar-success { - @include linear-gradient(#62C462, #51A351); - background-color: #468847; - } - .bar-danger { - @include linear-gradient(#EE5F5B, #BD362F); - background-color: #B94A48; - } - } - .upvotes { - display: inline-block; - color: #468847; - } - .downvotes { - display: inline-block; - color: #B94A48; - } -} -.votes-block { - margin: 6px; - .downvotes { - float: right; - } -} .votes-inline { display: inline-block; margin: 0 8px; } - |