Download as
Browse Code »

Commit 3becd06423ac584ab3f5a70284984dd21ba32697

Authored by gitlabhq
1 parent 0dc5364a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

icons & css

Showing 8 changed files with 124 additions and 163 deletions   Show diff stats
app/assets/images/icon-search.png 0 → 100644
View file @3becd06

422 Bytes
app/assets/stylesheets/style.scss
  Diff comments   View file @3becd06
... ... @@ -66,168 +66,17 @@ td { vertical-align: top; }
66 66 ========================================================================== */
67 67  
68 68 /* 960gs */
69   -/*
70   - Variable Grid System (Fluid Version).
71   - Learn more ~ http://www.spry-soft.com/grids/
72   - Based on 960 Grid System - http://960.gs/ & 960 Fluid - http://www.designinfluences.com/
73   -
74   - Licensed under GPL and MIT.
75   -*/
76   -
77   -
78   -/* Containers
79   -----------------------------------------------------------------------------------------------------*/
80   -.container_3 {
81   - width: 98%;
82   - margin-left: 1%;
83   - margin-right: 1%;
84   -}
85   -
86   -/* Grid >> Global
87   -----------------------------------------------------------------------------------------------------*/
88   -
89   -.grid_1,
90   -.grid_2,
91   -.grid_3 {
92   - display:inline;
93   - float: left;
94   - position: relative;
95   - margin-left: 1%;
96   - margin-right: 1%;
97   -}
98   -
99   -/* Grid >> Children (Alpha ~ First, Omega ~ Last)
100   -----------------------------------------------------------------------------------------------------*/
101   -
102   -.alpha {
103   - margin-left: 0;
104   -}
105   -
106   -.omega {
107   - margin-right: 0;
108   -}
109   -
110   -/* Grid >> 3 Columns
111   -----------------------------------------------------------------------------------------------------*/
112   -
113   -
114   -.container_3 .grid_1 {
115   - width:31.333%;
116   -}
117   -
118   -.container_3 .grid_2 {
119   - width:64.667%;
120   -}
121   -
122   -.container_3 .grid_3 {
123   - width:98.0%;
124   -}
125   -
126   -
127   -
128   -/* Prefix Extra Space >> 3 Columns
129   -----------------------------------------------------------------------------------------------------*/
130   -
131   -
132   -.container_3 .prefix_1 {
133   - padding-left:33.333%;
134   -}
135   -
136   -.container_3 .prefix_2 {
137   - padding-left:66.667%;
138   -}
139   -
140   -
141   -
142   -/* Suffix Extra Space >> 3 Columns
143   -----------------------------------------------------------------------------------------------------*/
144   -
145   -
146   -.container_3 .suffix_1 {
147   - padding-right:33.333%;
148   -}
149   -
150   -.container_3 .suffix_2 {
151   - padding-right:66.667%;
152   -}
153   -
154   -
155   -
156   -/* Push Space >> 3 Columns
157   -----------------------------------------------------------------------------------------------------*/
158   -
159   -
160   -.container_3 .push_1 {
161   - left:33.333%;
162   -}
163   -
164   -.container_3 .push_2 {
165   - left:66.667%;
166   -}
167   -
168   -
169   -
170   -/* Pull Space >> 3 Columns
171   -----------------------------------------------------------------------------------------------------*/
172   -
173   -
174   -.container_3 .pull_1 {
175   - left:-33.333%;
176   -}
177   -
178   -.container_3 .pull_2 {
179   - left:-66.667%;
180   -}
181   -
182   -
183   -
184   -
185   -/* Clear Floated Elements
186   -----------------------------------------------------------------------------------------------------*/
187   -
188   -/* http://sonspring.com/journal/clearing-floats */
189   -
190   -.clear {
191   - clear: both;
192   - display: block;
193   - overflow: hidden;
194   - visibility: hidden;
195   - width: 0;
196   - height: 0;
197   -}
198   -
199   -/* http://perishablepress.com/press/2008/02/05/lessons-learned-concerning-the-clearfix-css-hack */
200   -
201   -.clearfix:after {
202   - clear: both;
203   - content: ' ';
204   - display: block;
205   - font-size: 0;
206   - line-height: 0;
207   - visibility: hidden;
208   - width: 0;
209   - height: 0;
210   -}
211   -
212   -.clearfix {
213   - display: inline-block;
214   -}
215   -
216   -* html .clearfix {
217   - height: 1%;
218   -}
219   -
220   -.clearfix {
221   - display: block;
222   -}/* eo 960gs*/
  69 +.container_4{width:98%;margin-left:1%;margin-right:1%}.grid_1,.grid_2,.grid_3,.grid_4{display:inline;float:left;position:relative;margin-left:1%;margin-right:1%}.alpha{margin-left:0}.omega{margin-right:0}.container_4 .grid_1{width:23.0%}.container_4 .grid_2{width:48.0%}.container_4 .grid_3{width:73.0%}.container_4 .grid_4{width:98.0%}.container_4 .prefix_1{padding-left:25.0%}.container_4 .prefix_2{padding-left:50.0%}.container_4 .prefix_3{padding-left:75.0%}.container_4 .suffix_1{padding-right:25.0%}.container_4 .suffix_2{padding-right:50.0%}.container_4 .suffix_3{padding-right:75.0%}.container_4 .push_1{left:25.0%}.container_4 .push_2{left:50.0%}.container_4 .push_3{left:75.0%}.container_4 .pull_1{left:-25.0%}.container_4 .pull_2{left:-50.0%}.container_4 .pull_3{left:-75.0%}.clear{clear:both;display:block;overflow:hidden;visibility:hidden;width:0;height:0}.clearfix:after{clear:both;content:' ';display:block;font-size:0;line-height:0;visibility:hidden;width:0;height:0}.clearfix{display:inline-block}* html .clearfix{height:1%}.clearfix{display:block}
  70 +/* eo 960gs*/
223 71  
224 72  
225 73 *{text-shadow: 0 1px 0 white}
226 74 body{font-size: 12px}
227   -a{text-decoration: none; font-weight: bold; color: #333}
228   -a:hover{color: #000}
  75 +a{text-decoration: none; font-weight: bold; color: #666}
  76 +a:hover{color: #333}
229 77 /* Typography */
230 78 h1,h2,h3,h4,h5{font-weight: normal; color: #666}
  79 +h2{margin: 1.5em 0}
231 80 /* eo Typography */
232 81  
233 82 /* Forms */
... ... @@ -243,6 +92,7 @@ input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding:
243 92 padding: 6px 20px;
244 93 border: 1px solid #999;
245 94 color: #666;
  95 + display: inline-block;
246 96 box-shadow: 0 1px 2px rgba(0,0,0,.3);
247 97 background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #f7f7f7), to(#d5d5d5));
248 98 background-image: -webkit-linear-gradient(#f7f7f7 7.6%, #d5d5d5);
... ... @@ -293,6 +143,7 @@ input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding:
293 143 padding: 1em;
294 144 font-size: 12px;
295 145 font-weight: normal;
  146 + font-weight: bold;
296 147 font-size: 16px;
297 148 border-bottom: 1px solid #DEDFE1;
298 149 -webkit-border-top-left-radius: 5px;
... ... @@ -303,6 +154,11 @@ input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding:
303 154 border-top-right-radius: 5px;
304 155 }
305 156  
  157 +.ui-box.ui-box-small h3{
  158 + padding: 8px 10px;
  159 + font-size: 12px;
  160 +}
  161 +
306 162 .ui-box h3 a{font-weight: normal;}
307 163  
308 164 .ui-box .data{padding: .5em 1em}
... ... @@ -316,7 +172,7 @@ input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding:
316 172 border-bottom-left-radius: 5px;
317 173 }
318 174  
319   -.ui-box:hover{box-shadow: 0 0 10px rgba(0,0,0,.1); border: 1px solid #ccc;
  175 +.ui-box.hover:hover{box-shadow: 0 0 10px rgba(0,0,0,.1); border: 1px solid #ccc;
320 176  
321 177 -webkit-transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715);
322 178 -moz-transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715);
... ... @@ -370,14 +226,16 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%}
370 226  
371 227  
372 228 /* General */
373   -header{background: #474D57 url('bg-header.png') repeat-x bottom; overflow: hidden; padding: 10px 2% 6px 2%}
  229 +
  230 +/* Header */
  231 +header{background: #474D57 url('../img/bg-header.png') repeat-x bottom; z-index: 10000; height: 44px; padding: 10px 2% 6px 2%}
374 232 header a{color: white; text-shadow: 0 -1px 0 black}
375 233 header a:hover{color: #f1f1f1}
376 234 header h1{
377 235 width: 65px;
378 236 }
379 237 header h1.logo{
380   - background: url('images.png') no-repeat -3px -6px;
  238 + background: url('../img/images.png') no-repeat -3px -6px;
381 239 width: 65px;
382 240 height: 26px;
383 241 margin: 5px 0;
... ... @@ -385,7 +243,7 @@ header h1.logo{
385 243 float: left;
386 244 text-indent: -1000em;
387 245 }
388   -header nav{border-radius: 4px; box-shadow: 0 1px 2px black; width: 321px; margin: auto;
  246 +header nav{border-radius: 4px; box-shadow: 0 1px 2px black; width: 294px; margin: auto;
389 247 background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595d63), to(#31363e));
390 248 background-image: -webkit-linear-gradient(#595d63 6.6%, #31363e);
391 249 background-image: -moz-linear-gradient(#595d63 6.6%, #31363e);
... ... @@ -424,9 +282,9 @@ header nav a.admin{
424 282 border-top-right-radius: 4px;
425 283 border-bottom-right-radius: 4px;
426 284 }
427   -header nav a.dashboard span{background: url('images.png') no-repeat -161px -4px; width: 20px; height: 20px; }
428   -header nav a.admin span{background: url('images.png') no-repeat -184px -4px; width: 20px; height: 20px;}
429   -header nav a.project span{background: url('images.png') no-repeat -209px -5px; width: 20px; height: 18px; top: 7px}
  285 +header nav a.dashboard span{background: url('../img/images.png') no-repeat -161px -4px; width: 20px; height: 20px; }
  286 +header nav a.admin span{background: url('../img/images.png') no-repeat -184px -4px; width: 20px; height: 20px;}
  287 +header nav a.project span{background: url('../img/images.png') no-repeat -209px -5px; width: 20px; height: 18px; top: 7px}
430 288  
431 289 header .login-top{float: right; width: 180px;
432 290 background-image: -webkit-gradient(linear, 0 0, 0 62, color-stop(0.032, #464c56), to(#363c45));
... ... @@ -446,7 +304,110 @@ header{margin-bottom: 0; clear: both; }
446 304  
447 305 .page-title{background-color: #f1f1f1;display: block; float: left; clear: both; width: 98%; padding: 0 1%; border-bottom: 1px solid #ccc; box-shadow: 0 -1px 0 white inset; margin-bottom: 1.5em}
448 306 .page-title a.grey-button{float: right;}
  307 +.right{float: right;}
  308 +
  309 +/* Account box */
  310 +header .account-box{position: relative;z-index: 10000; top: -3px; width: 38px; height: 38px; font-size: 11px; float: right; display: block; cursor: pointer; }
  311 +header .account-box img{ border-radius: 4px; width: 38px; height: 38px; display: block; box-shadow: 0 1px 2px black}
  312 +header .account-box:after{
  313 + content: " ";
  314 + display: block;
  315 + position: absolute;
  316 + top: 0;
  317 + right: 0;
  318 +left: 0;
  319 + bottom: 0;
  320 +float: right;
  321 + border-radius: 5px;
  322 + border: 1px solid rgba(255, 255, 255, .1);
  323 + border-bottom: 0;
  324 + background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, .15)), to(rgba(0, 0, 0, .25))), -webkit-gradient(linear, left top, right bottom, color-stop(0, rgba(255, 255, 255, 0)), color-stop(0.5, rgba(255, 255, 255, .1)), color-stop(0.501, rgba(255, 255, 255, 0)), color-stop(1, rgba(255, 255, 255, 0)));
  325 + background: -moz-linear-gradient(top, rgba(255, 255, 255, .15), rgba(0, 0, 0, .25)), -moz-linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0));
  326 + background: linear-gradient(top, rgba(255, 255, 255, .15), rgba(0, 0, 0, .25)), linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0));
  327 + -webkit-background-origin: border-box;
  328 + -moz-background-origin: border;
  329 + background-origin: border-box;
  330 +}
  331 +
  332 +.account-box:hover > .account-links, .account-box:hover > .arrow-up{display: block;}
  333 +header .account-links{background: white; display: none; border-radius: 5px; width: 100px; margin-top: 0; float: right; box-shadow: 0 1px 1px rgba(0,0,0,.2); }
  334 +header .account-links a{color: #666; padding: 6px 10px; display: block; text-shadow: none; border-bottom: 1px solid #eee}
  335 +header .account-links a:hover{background-color: #f1f1f1; text-shadow: none; color: #333}
  336 +
  337 +header .account-links a:first-child{
  338 + -webkit-border-top-left-radius: 5px;
  339 + -webkit-border-top-right-radius: 5px;
  340 + -moz-border-radius-topleft: 5px;
  341 + -moz-border-radius-topright: 5px;
  342 + border-top-left-radius: 5px;
  343 + border-top-right-radius: 5px;
  344 +}
  345 +
  346 +header .account-links a:last-child{
  347 + -webkit-border-bottom-right-radius: 5px;
  348 + -webkit-border-bottom-left-radius: 5px;
  349 + -moz-border-radius-bottomright: 5px;
  350 + -moz-border-radius-bottomleft: 5px;
  351 + border-bottom-right-radius: 5px;
  352 + border-bottom-left-radius: 5px;
  353 + border-bottom: 0;
  354 +}
449 355  
  356 +header a.arrow-up{
  357 + display: none;
  358 + width: 0;
  359 + height: 0;
  360 + float: right;
  361 + margin-right: 26px;
  362 + margin-bottom: 0;
  363 + border-left: 5px solid transparent;
  364 + border-right: 5px solid transparent;
  365 +
  366 + border-bottom: 5px solid white;
  367 +}
  368 +/* eo Account Box */
  369 +input.search-input{float: right; text-shadow: none; width: 216px; background-image: url('../img/icon-search.png') ; background-repeat: no-repeat; background-position: 10px; border-radius: 100px; border: 1px solid rgba(0,0,0,.7); box-shadow: 0 1px 0 rgba(255,255,255,.2), 0 2px 2px rgba(0,0,0,.4) inset ; background-color: #D2D5DA; background-color: rgba(255,255,255,.5); padding: 5px; padding-left: 26px; margin-top: 4px; margin-right: 10px }
  370 +input.search-input:focus{ background-color: white; }
  371 +input.search-input::-webkit-input-placeholder {color: #666}
  372 +/* eo Header */
  373 +
  374 +
  375 +h2.icon{position: relative; padding-left: 36px}
  376 +h2.icon span{background: #E3E5EA; height: 26px; width: 26px; left: 0; top: -2px; border-radius: 4px; display: inline-block; position: absolute}
  377 +
  378 +.button-small{ text-shadow: none; padding: 4px 10px; }
  379 +.button-green{background: #A6B807; color: white}
  380 +
  381 +
  382 +
  383 +
  384 +
  385 +/* Dashboard Page */
  386 +.dashboard-page header{margin-bottom: 0}
  387 +.dashboard-page .news-feed{padding-left: 1em; margin-right: 450px; margin-left: 1%}
  388 +
  389 +.dashboard-content{ position: absolute; float: left; width: 100%; height: 100%;}
  390 +.dashboard-page .news-feed h2{float: left;}
  391 +.dashboard-page aside{ width: 420px; float: right; right: 0; height: 100%; bottom: 0; position: absolute; background-color: #f7f7f7; border-left: 1px solid #ccc }
  392 +.dashboard-page aside h4{margin: 0; border-bottom: 1px solid #ccc; padding: 10px 10px; font-size: 11px; font-weight: bold; text-transform: uppercase;}
  393 +.dashboard-page aside h4 a.button-small{float: right; text-transform: none; border-radius: 4px; margin-top: -4px; display: block;}
  394 +.dashboard-page aside .project-list {list-style: none; margin: 0; padding: 0;}
  395 +.dashboard-page aside .project-list li a {background: white; color: #4BB8D2; display: block; border-bottom: 1px solid #eee; padding: 14px 6% 14px 14px;}
  396 +.dashboard-page aside .project-list li a:hover {background: #f1f1f1}
  397 +.dashboard-page aside .project-list li a:hover span.arrow{background-color: #E3E5EA;}
  398 +.dashboard-page aside .project-list li a span.project-name{font-size: 14px; display: block; margin-bottom: 8px}
  399 +.dashboard-page aside .project-list li a span.time{color: #666; font-weight: normal; font-size: 11px}
  400 +.dashboard-page aside .project-list li a span.arrow{float: right; background: #E3E5EA; padding: 10px; border-radius: 5px; margin-top: 2px; text-shadow: none; color: #999}
  401 +.dashboard-page .news-feed .project-updates {margin-bottom: 20px;}
  402 +.dashboard-page .news-feed .project-updates .data{ padding: 0}
  403 +.dashboard-page .news-feed .project-updates a.project-update {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
  404 +.dashboard-page .news-feed .project-updates a.project-update:last-child{border-bottom: 0}
  405 +.dashboard-page .news-feed .project-updates a.project-update img{float: left; margin-right: 10px;}
  406 +.dashboard-page .news-feed .project-updates a.project-update span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;}
  407 +.dashboard-page .news-feed .project-updates a.project-update span.update-title{margin-bottom: 10px}
  408 +.dashboard-page .news-feed .project-updates a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;}
  409 +.dashboard-page .news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;}
  410 +/* eo Dashboard Page */
450 411  
451 412  
452 413  
... ...
public/apple-touch-icon-114x114-precomposed.png 0 → 100755
View file @3becd06

1.01 KB
public/apple-touch-icon-57x57-precomposed.png 0 → 100755
View file @3becd06

640 Bytes
public/apple-touch-icon-72x72-precomposed.png 0 → 100755
View file @3becd06

747 Bytes
public/apple-touch-icon-precomposed.png 0 → 100755
View file @3becd06

640 Bytes
public/apple-touch-icon.png 0 → 100755
View file @3becd06

640 Bytes
public/favicon.ico 100644 → 100755
View file @3becd06
No preview for this file type