Commit 15b1b515243dd4a871e2f28da38258cd64b713da
1 parent
b4cc04d7
Exists in
master
and in
4 other branches
css refactoring & utf8 meta tag
Showing
10 changed files
with
147 additions
and
136 deletions
Show diff stats
@@ -0,0 +1,141 @@ | @@ -0,0 +1,141 @@ | ||
1 | +/* Buttons */ | ||
2 | +.grey-button{ | ||
3 | + border-radius: 5px; | ||
4 | + font-size: 12px; | ||
5 | + font-weight: bold; | ||
6 | + padding: 5px 17px; | ||
7 | + border: 1px solid #999; | ||
8 | + color: #666; | ||
9 | + display: inline-block; | ||
10 | + box-shadow: 0 1px 2px rgba(0,0,0,.3); | ||
11 | + background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4)); | ||
12 | + background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4); | ||
13 | + background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4); | ||
14 | + background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4); | ||
15 | +} | ||
16 | + | ||
17 | +.red-button{ | ||
18 | + border-radius: 5px; | ||
19 | + font-size: 12px; | ||
20 | + font-weight: bold; | ||
21 | + padding: 5px 17px; | ||
22 | + border: 1px solid #999; | ||
23 | + color: #666; | ||
24 | + display: inline-block; | ||
25 | + box-shadow: 0 1px 2px rgba(0,0,0,.3); | ||
26 | + background: #D12F19; | ||
27 | + color: white; | ||
28 | +} | ||
29 | + | ||
30 | +.positive-button{ | ||
31 | + border-radius: 5px; | ||
32 | + font-size: 12px; | ||
33 | + font-weight: bold; | ||
34 | + padding: 5px 17px; | ||
35 | + border: 1px solid #999; | ||
36 | + color: #666; | ||
37 | + display: inline-block; | ||
38 | + box-shadow: 0 1px 2px rgba(0,0,0,.3); | ||
39 | + background: #4A2; | ||
40 | + color: white; | ||
41 | +} | ||
42 | + | ||
43 | + | ||
44 | +.lbutton, | ||
45 | +.lite_button { | ||
46 | + display:block; | ||
47 | + float:left; | ||
48 | + margin: 0px 5px 0px 0px; | ||
49 | + padding:5px 10px; | ||
50 | + | ||
51 | + font-family:"Helvetica Neue", Arial, Helvetica, sans-serif; | ||
52 | + border:1px solid #D3D3D3; | ||
53 | + background:white; | ||
54 | + font-size:12px !important; | ||
55 | + line-height:130%; | ||
56 | + text-decoration:none; | ||
57 | + font-weight:bold; | ||
58 | + color:#565656; | ||
59 | + cursor:pointer; | ||
60 | + | ||
61 | + &:hover { | ||
62 | + border:1px solid #C2E1EF; | ||
63 | + color: #0099FF; | ||
64 | + } | ||
65 | + | ||
66 | + &.hm { | ||
67 | + margin: 0px 0px; | ||
68 | + } | ||
69 | + | ||
70 | + &.vm { | ||
71 | + margin: 5px 0px; | ||
72 | + } | ||
73 | +} | ||
74 | + | ||
75 | +a.button, input.button { | ||
76 | + font-weight: bold; | ||
77 | + padding: 10px 20px; | ||
78 | + text-align: center; | ||
79 | + display: inline-block; | ||
80 | + border-radius: 5px; | ||
81 | + color: #578E91; | ||
82 | + font-size: 12px; | ||
83 | + text-transform: uppercase; | ||
84 | + border: 1px solid #8CE2E6; | ||
85 | + background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbf5f6), to(#c5eef0)); | ||
86 | + background-image: -webkit-linear-gradient(#dbf5f6 79.4%, #c5eef0); | ||
87 | + background-image: -moz-linear-gradient(#dbf5f6 79.4%, #c5eef0); | ||
88 | + background-image: -o-linear-gradient(#dbf5f6 79.4%, #c5eef0); | ||
89 | +} | ||
90 | + | ||
91 | +input.button{margin-bottom: 1.5em} | ||
92 | + | ||
93 | +.button:hover {color: rgba(0,0,0,.8)} | ||
94 | + | ||
95 | +.button.green {margin-right: 0; } | ||
96 | + | ||
97 | +.button.yellow{ | ||
98 | + color: #908054; | ||
99 | + border-color: #DDCDA1; | ||
100 | + background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #FFEFC3), to(#F3E3B7)); | ||
101 | + background-image: -webkit-linear-gradient(#FFEFC3 79.4%, #F3E3B7); | ||
102 | + background-image: -moz-linear-gradient(#FFEFC3 79.4%, #F3E3B7); | ||
103 | + background-image: -o-linear-gradient(#FFEFC3 79.4%, #F3E3B7); | ||
104 | +} | ||
105 | + | ||
106 | +.button.blue{ | ||
107 | + color: #417E97; | ||
108 | + border-color: #b2cdec; | ||
109 | + background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbe8f6), to(#c7daf1)); | ||
110 | + background-image: -webkit-linear-gradient(#dbe8f6 79.4%, #c7daf1); | ||
111 | + background-image: -moz-linear-gradient(#dbe8f6 79.4%, #c7daf1); | ||
112 | + background-image: -o-linear-gradient(#dbe8f6 79.4%, #c7daf1); | ||
113 | +} | ||
114 | + | ||
115 | +.button-small{ text-shadow: none; padding: 4px 10px; } | ||
116 | +.button-green{background: #A6B807; color: white} | ||
117 | + | ||
118 | + | ||
119 | +.commit-button{ | ||
120 | + background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4)); | ||
121 | + background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4); | ||
122 | + background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4); | ||
123 | + background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4); | ||
124 | + box-shadow: 0 -1px 0 white inset; | ||
125 | + display: block; | ||
126 | + border: 1px solid #eee; | ||
127 | + border-radius: 5px; | ||
128 | + margin-bottom: 2px; | ||
129 | + position: relative; | ||
130 | + padding-right: 20px !important; | ||
131 | +} | ||
132 | + | ||
133 | +.commit-button i{ | ||
134 | + background: url('images.png') no-repeat -138px -27px; | ||
135 | + width: 6px; | ||
136 | + height: 9px; | ||
137 | + float: right; | ||
138 | + position: absolute; | ||
139 | + top: 6px; | ||
140 | + right: 5px; | ||
141 | +} |
app/assets/stylesheets/commits.css.scss
@@ -4,29 +4,6 @@ body.project-page.commits-page .commit-info data{ | @@ -4,29 +4,6 @@ body.project-page.commits-page .commit-info data{ | ||
4 | padding: 4px 10px; | 4 | padding: 4px 10px; |
5 | font-size: 11px; | 5 | font-size: 11px; |
6 | } | 6 | } |
7 | -body.project-page.commits-page .commit-info data.commit-button{ | ||
8 | - background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4)); | ||
9 | - background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4); | ||
10 | - background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4); | ||
11 | - background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4); | ||
12 | - box-shadow: 0 -1px 0 white inset; | ||
13 | - display: block; | ||
14 | - border: 1px solid #eee; | ||
15 | - border-radius: 5px; | ||
16 | - margin-bottom: 2px; | ||
17 | - position: relative; | ||
18 | - padding-right: 20px; | ||
19 | -} | ||
20 | - | ||
21 | -body.project-page.commits-page .commit-button i{ | ||
22 | - background: url('images.png') no-repeat -138px -27px; | ||
23 | - width: 6px; | ||
24 | - height: 9px; | ||
25 | - float: right; | ||
26 | - position: absolute; | ||
27 | - top: 6px; | ||
28 | - right: 5px; | ||
29 | -} | ||
30 | body.project-page.commits-page .commits-date {display: block; width: 100%; margin-bottom: 20px} | 7 | body.project-page.commits-page .commits-date {display: block; width: 100%; margin-bottom: 20px} |
31 | body.project-page.commits-page .commits-date .data {padding: 0} | 8 | body.project-page.commits-page .commits-date .data {padding: 0} |
32 | body.project-page.commits-page a.commit{padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} | 9 | body.project-page.commits-page a.commit{padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} |
app/assets/stylesheets/common.scss
app/assets/stylesheets/projects.css.scss
@@ -122,37 +122,6 @@ input.ssh_project_url { | @@ -122,37 +122,6 @@ input.ssh_project_url { | ||
122 | } | 122 | } |
123 | 123 | ||
124 | 124 | ||
125 | -/** Buttons **/ | ||
126 | -.lbutton, | ||
127 | -.lite_button { | ||
128 | - display:block; | ||
129 | - float:left; | ||
130 | - margin: 0px 5px 0px 0px; | ||
131 | - padding:5px 10px; | ||
132 | - | ||
133 | - font-family:"Helvetica Neue", Arial, Helvetica, sans-serif; | ||
134 | - border:1px solid #D3D3D3; | ||
135 | - background:white; | ||
136 | - font-size:12px !important; | ||
137 | - line-height:130%; | ||
138 | - text-decoration:none; | ||
139 | - font-weight:bold; | ||
140 | - color:#565656; | ||
141 | - cursor:pointer; | ||
142 | - | ||
143 | - &:hover { | ||
144 | - border:1px solid #C2E1EF; | ||
145 | - color: #0099FF; | ||
146 | - } | ||
147 | - | ||
148 | - &.hm { | ||
149 | - margin: 0px 0px; | ||
150 | - } | ||
151 | - | ||
152 | - &.vm { | ||
153 | - margin: 5px 0px; | ||
154 | - } | ||
155 | -} | ||
156 | 125 | ||
157 | #user_projects_limit{ | 126 | #user_projects_limit{ |
158 | width: 60px; | 127 | width: 60px; |
@@ -449,31 +418,6 @@ h4.dash-tabs { | @@ -449,31 +418,6 @@ h4.dash-tabs { | ||
449 | } | 418 | } |
450 | 419 | ||
451 | 420 | ||
452 | -.red-button{ | ||
453 | - border-radius: 5px; | ||
454 | - font-size: 12px; | ||
455 | - font-weight: bold; | ||
456 | - padding: 5px 17px; | ||
457 | - border: 1px solid #999; | ||
458 | - color: #666; | ||
459 | - display: inline-block; | ||
460 | - box-shadow: 0 1px 2px rgba(0,0,0,.3); | ||
461 | - background: #D12F19; | ||
462 | - color: white; | ||
463 | -} | ||
464 | - | ||
465 | -.positive-button{ | ||
466 | - border-radius: 5px; | ||
467 | - font-size: 12px; | ||
468 | - font-weight: bold; | ||
469 | - padding: 5px 17px; | ||
470 | - border: 1px solid #999; | ||
471 | - color: #666; | ||
472 | - display: inline-block; | ||
473 | - box-shadow: 0 1px 2px rgba(0,0,0,.3); | ||
474 | - background: #4A2; | ||
475 | - color: white; | ||
476 | -} | ||
477 | 421 | ||
478 | 422 | ||
479 | .dark_scheme_box { | 423 | .dark_scheme_box { |
app/assets/stylesheets/style.scss
@@ -130,64 +130,7 @@ table thead .image{width:100px} | @@ -130,64 +130,7 @@ table thead .image{width:100px} | ||
130 | .listed_items tr.odd:hover{background-color:#FFFFCF} | 130 | .listed_items tr.odd:hover{background-color:#FFFFCF} |
131 | /* eo Tables */ | 131 | /* eo Tables */ |
132 | 132 | ||
133 | -/* Buttons */ | ||
134 | -.grey-button{ | ||
135 | - border-radius: 5px; | ||
136 | - font-size: 12px; | ||
137 | - font-weight: bold; | ||
138 | - padding: 5px 17px; | ||
139 | - border: 1px solid #999; | ||
140 | - color: #666; | ||
141 | - display: inline-block; | ||
142 | - box-shadow: 0 1px 2px rgba(0,0,0,.3); | ||
143 | - background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #f7f7f7), to(#d5d5d5)); | ||
144 | - background-image: -webkit-linear-gradient(#f7f7f7 7.6%, #d5d5d5); | ||
145 | - background-image: -moz-linear-gradient(#f7f7f7 7.6%, #d5d5d5); | ||
146 | - background-image: -o-linear-gradient(#f7f7f7 7.6%, #d5d5d5); | ||
147 | -} | ||
148 | - | ||
149 | -a.button, input.button { | ||
150 | - font-weight: bold; | ||
151 | - padding: 10px 20px; | ||
152 | - text-align: center; | ||
153 | - display: inline-block; | ||
154 | - border-radius: 5px; | ||
155 | - color: #578E91; | ||
156 | - font-size: 12px; | ||
157 | - text-transform: uppercase; | ||
158 | - border: 1px solid #8CE2E6; | ||
159 | - background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbf5f6), to(#c5eef0)); | ||
160 | - background-image: -webkit-linear-gradient(#dbf5f6 79.4%, #c5eef0); | ||
161 | - background-image: -moz-linear-gradient(#dbf5f6 79.4%, #c5eef0); | ||
162 | - background-image: -o-linear-gradient(#dbf5f6 79.4%, #c5eef0); | ||
163 | -} | ||
164 | - | ||
165 | -input.button{margin-bottom: 1.5em} | ||
166 | - | ||
167 | -.button:hover {color: rgba(0,0,0,.8)} | ||
168 | - | ||
169 | -.button.green {margin-right: 0; } | ||
170 | - | ||
171 | -.button.yellow{ | ||
172 | - color: #908054; | ||
173 | - border-color: #DDCDA1; | ||
174 | - background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #FFEFC3), to(#F3E3B7)); | ||
175 | - background-image: -webkit-linear-gradient(#FFEFC3 79.4%, #F3E3B7); | ||
176 | - background-image: -moz-linear-gradient(#FFEFC3 79.4%, #F3E3B7); | ||
177 | - background-image: -o-linear-gradient(#FFEFC3 79.4%, #F3E3B7); | ||
178 | -} | ||
179 | - | ||
180 | -.button.blue{ | ||
181 | - color: #417E97; | ||
182 | - border-color: #b2cdec; | ||
183 | - background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbe8f6), to(#c7daf1)); | ||
184 | - background-image: -webkit-linear-gradient(#dbe8f6 79.4%, #c7daf1); | ||
185 | - background-image: -moz-linear-gradient(#dbe8f6 79.4%, #c7daf1); | ||
186 | - background-image: -o-linear-gradient(#dbe8f6 79.4%, #c7daf1); | ||
187 | -} | ||
188 | 133 | ||
189 | -.button-small{ text-shadow: none; padding: 4px 10px; } | ||
190 | -.button-green{background: #A6B807; color: white} | ||
191 | 134 | ||
192 | /* eo Buttons */ | 135 | /* eo Buttons */ |
193 | 136 |
app/views/layouts/admin.html.haml
1 | !!! | 1 | !!! |
2 | %html | 2 | %html |
3 | %head | 3 | %head |
4 | + %meta{:charset => "utf-8"} | ||
4 | %title | 5 | %title |
5 | GitLab #{" - #{@project.name}" if @project && !@project.new_record?} | 6 | GitLab #{" - #{@project.name}" if @project && !@project.new_record?} |
6 | = favicon_link_tag 'favicon.ico' | 7 | = favicon_link_tag 'favicon.ico' |
app/views/layouts/application.html.haml
app/views/layouts/devise.html.haml
1 | !!! | 1 | !!! |
2 | %html | 2 | %html |
3 | %head | 3 | %head |
4 | + %meta{:charset => "utf-8"} | ||
4 | %title | 5 | %title |
5 | GitLab #{" - #{@project.name}" if @project && !@project.new_record?} | 6 | GitLab #{" - #{@project.name}" if @project && !@project.new_record?} |
6 | = favicon_link_tag 'favicon.ico' | 7 | = favicon_link_tag 'favicon.ico' |
app/views/layouts/profile.html.haml
1 | !!! | 1 | !!! |
2 | %html | 2 | %html |
3 | %head | 3 | %head |
4 | + %meta{:charset => "utf-8"} | ||
4 | %title | 5 | %title |
5 | GitLab #{" - #{@project.name}" if @project && !@project.new_record?} | 6 | GitLab #{" - #{@project.name}" if @project && !@project.new_record?} |
6 | = favicon_link_tag 'favicon.ico' | 7 | = favicon_link_tag 'favicon.ico' |
app/views/layouts/project.html.haml
1 | !!! | 1 | !!! |
2 | %html | 2 | %html |
3 | %head | 3 | %head |
4 | + %meta{:charset => "utf-8"} | ||
4 | %title | 5 | %title |
5 | GitLab #{" - #{@project.name}" if @project && !@project.new_record?} | 6 | GitLab #{" - #{@project.name}" if @project && !@project.new_record?} |
6 | = favicon_link_tag 'favicon.ico' | 7 | = favicon_link_tag 'favicon.ico' |