Download as
Browse Code »

Commit b096ee327598919b2d78a99ce82e6b0107369604

Authored by Dmitriy Zaporozhets
1 parent b742f47e
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

a bit of split up for gitlab-bootstrap

Showing 4 changed files with 75 additions and 74 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap.scss
  Diff comments   View file @b096ee3
... ... @@ -17,6 +17,8 @@ $baseLineHeight: 18px !default;
17 17 @import "gitlab_bootstrap/variables.scss";
18 18 @import "gitlab_bootstrap/fonts.scss";
19 19 @import "gitlab_bootstrap/mixins.scss";
  20 +@import "gitlab_bootstrap/avatar.scss";
  21 +@import "gitlab_bootstrap/nav.scss";
20 22 @import "gitlab_bootstrap/common.scss";
21 23 @import "gitlab_bootstrap/typography.scss";
22 24 @import "gitlab_bootstrap/buttons.scss";
... ...
app/assets/stylesheets/gitlab_bootstrap/avatar.scss 0 → 100644
  Diff comments   View file @b096ee3
... ... @@ -0,0 +1,8 @@
  1 +/** AVATARS **/
  2 +img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; }
  3 +img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }
  4 +img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; }
  5 +img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; }
  6 +img.avatar.s90 { width: 90px; height: 90px; margin-right: 15px; }
  7 +img.lil_av { padding-left: 4px; padding-right: 3px; }
  8 +img.small { width: 80px; }
... ...
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @b096ee3
... ... @@ -21,88 +21,14 @@
21 21 .light { color: #888 }
22 22 .tiny { font-weight: normal }
23 23  
24   -/** PILLS & TABS**/
25   -.nav-pills {
26   - .active a {
27   - background: $primary_color;
28   - }
29   -
30   - > li > a {
31   - @include border-radius(0);
32   - }
33   - &.nav-stacked {
34   - > li > a {
35   - border-left: 4px solid #EEE;
36   - padding: 12px;
37   - }
38   - > .active > a {
39   - border-color: #29B;
40   - border-radius: 0;
41   - background: #F1F1F1;
42   - color: $style_color;
43   - font-weight: bold;
44   - }
45   - }
46   -}
47   -
48   -.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
49   -
50   -
51   -
52   -/**
53   - * nav-tabs
54   - *
55   - */
56   -.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
57   -.nav.nav-tabs {
58   - li {
59   - > a {
60   - padding: 8px 20px;
61   - margin-right: 7px;
62   - line-height: 20px;
63   - border-color: #EEE;
64   - color: #888;
65   - border-bottom: 1px solid #ddd;
66   - .badge {
67   - background-color: #eee;
68   - color: #888;
69   - text-shadow: 0 1px 1px #fff;
70   - }
71   - i[class^="icon-"] {
72   - line-height: 14px;
73   - }
74   - }
75   - &.active {
76   - > a {
77   - border-color: #CCC;
78   - border-bottom: 1px solid #fff;
79   - color: #333;
80   - }
81   - }
82   - }
83   -
84   - &.nav-small-tabs > li > a { padding: 6px 9px; }
85   -}
86 24  
87 25 /** ALERT MESSAGES **/
88   -.alert-message { @extend .alert; }
89   -.alert-message.error { @extend .alert-error; }
90   -
91 26 .alert.alert-disabled {
92 27 background: #EEE;
93 28 color: #777;
94 29 border-color: #DDD;
95 30 }
96 31  
97   -/** AVATARS **/
98   -img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; }
99   -img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }
100   -img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; }
101   -img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; }
102   -img.avatar.s90 { width: 90px; height: 90px; margin-right: 15px; }
103   -img.lil_av { padding-left: 4px; padding-right: 3px; }
104   -img.small { width: 80px; }
105   -
106 32 /** HELPERS **/
107 33 .nothing_here_message {
108 34 text-align: center;
... ...
app/assets/stylesheets/gitlab_bootstrap/nav.scss 0 → 100644
  Diff comments   View file @b096ee3
... ... @@ -0,0 +1,65 @@
  1 +/**
  2 + * nav-pills
  3 + *
  4 + */
  5 +.nav-pills {
  6 + .active a {
  7 + background: $primary_color;
  8 + }
  9 +
  10 + > li > a {
  11 + @include border-radius(0);
  12 + }
  13 + &.nav-stacked {
  14 + > li > a {
  15 + border-left: 4px solid #EEE;
  16 + padding: 12px;
  17 + }
  18 + > .active > a {
  19 + border-color: #29B;
  20 + border-radius: 0;
  21 + background: #F1F1F1;
  22 + color: $style_color;
  23 + font-weight: bold;
  24 + }
  25 + }
  26 +}
  27 +
  28 +.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
  29 +
  30 +
  31 +
  32 +/**
  33 + * nav-tabs
  34 + *
  35 + */
  36 +.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
  37 +.nav.nav-tabs {
  38 + li {
  39 + > a {
  40 + padding: 8px 20px;
  41 + margin-right: 7px;
  42 + line-height: 20px;
  43 + border-color: #EEE;
  44 + color: #888;
  45 + border-bottom: 1px solid #ddd;
  46 + .badge {
  47 + background-color: #eee;
  48 + color: #888;
  49 + text-shadow: 0 1px 1px #fff;
  50 + }
  51 + i[class^="icon-"] {
  52 + line-height: 14px;
  53 + }
  54 + }
  55 + &.active {
  56 + > a {
  57 + border-color: #CCC;
  58 + border-bottom: 1px solid #fff;
  59 + color: #333;
  60 + }
  61 + }
  62 + }
  63 +
  64 + &.nav-small-tabs > li > a { padding: 6px 9px; }
  65 +}
... ...