deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

replaced redundant -*-border-radius box-shadows and others with corresponding mixins

Browse source
This commit is contained in:
Koen Punt 2012-11-23 17:51:38 +01:00
parent 84de1b71d1
commit b825582eb1
26 changed files with 240 additions and 268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/common.scss
View file

@ -450,7 +450,7 @@ p.time {
background: #E3E5EA;
padding: 5px;
margin-top: 5px;
border-radius: 5px;
@include border-radius(5px);
text-shadow: none;
color: #999;
line-height: 16px;

4
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
View file

@ -41,7 +41,7 @@
}
.middle_box_content {
border-radius: 0;
@include border-radius(0);
border: none;
font-size: 12px;
background-color: #f5f5f5;
@ -96,7 +96,7 @@
padding: 3px 0;
&.active a { background-color: $style_color; }
a {
border-radius: 7px;
@include border-radius(7px);
}
}
}

4
app/assets/stylesheets/highlight/white.scss
View file

@ -65,7 +65,5 @@
}
.shadow {
-webkit-box-shadow:0 5px 15px #000;
-moz-box-shadow:0 5px 15px #000;
box-shadow:0 5px 15px #000;
@include box-shadow(0 5px 15px #000);
}

31
app/assets/stylesheets/mixins.scss
View file

@ -10,37 +10,36 @@
box-shadow: 0 0 0 3px #f1f1f1;
}
@mixin box-shadow($shadow) {
-webkit-box-shadow: $radius;
-moz-box-shadow: $radius;
-ms-box-shadow: $radius;
-o-box-shadow: $radius;
box-shadow: $radius;
}
@mixin border-radius($radius) {
-moz-border-radius: $radius;
-webkit-border-radius: $radius;
-moz-border-radius: $radius;
-ms-border-radius: $radius;
-o-border-radius: $radius;
border-radius: $radius;
}
@mixin round-borders-bottom($radius) {
border-top: 1px solid #eaeaea;
-webkit-border-bottom-left-radius: $radius;
-webkit-border-bottom-right-radius: $radius;
-moz-border-radius-bottomright: $radius;
-moz-border-radius-bottomleft: $radius;
border-bottom-right-radius: $radius;
border-bottom-left-radius: $radius;
@include border-radius(0 0 $radius $radius);
}
@mixin round-borders-top($radius) {
border-top: 1px solid #eaeaea;
-moz-border-radius-topright: $radius;
-moz-border-radius-topleft: $radius;
border-top-right-radius: $radius;
border-top-left-radius: $radius;
-webkit-border-top-left-radius: $radius;
-webkit-border-top-right-radius: $radius;
@include border-radius($radius $radius 0 0);
}
@mixin round-borders-all($radius) {
border: 1px solid #eaeaea;
-moz-border-radius: $radius;
-webkit-border-radius: $radius;
border-radius: $radius;
@include border-radius($radius);
}
@mixin bg-gradient($from, $to) {

8
app/assets/stylesheets/ref_select.scss
View file

@ -33,9 +33,7 @@
.chzn-container {
.chzn-search {
input:focus {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
@include box-shadow(none);
}
}
@ -43,7 +41,7 @@
margin: 7px 0;
min-width: 200px;
border: 1px solid #bbb;
border-radius: 0;
@include border-radius(0);
.chzn-results {
margin-top: 5px;
@ -55,7 +53,7 @@
padding: 8px;
}
.active-result {
border-radius: 0;
@include border-radius(0);
&.highlighted {
background: $hover;

1
app/assets/stylesheets/sections/commits.scss
View file

@ -79,6 +79,7 @@
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);

2
app/assets/stylesheets/sections/editor.scss
View file

@ -1,7 +1,7 @@
.file-editor {
#editor{
border: none;
border-radius: 0;
@include border-radius(0);
height: 500px;
margin: 0;
padding: 0;

23
app/assets/stylesheets/sections/header.scss
View file

@ -132,7 +132,7 @@ header {
left: 0;
bottom: 0;
float: right;
border-radius: 5px;
@include border-radius(5px);
border: 1px solid rgba(255, 255, 255, 0.1);
border-bottom: 0;
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, 0.15)), to(rgba(0, 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, 0.1)), color-stop(0.501, rgba(255, 255, 255, 0)), color-stop(1, rgba(255, 255, 255, 0)));
@ -149,7 +149,7 @@ header {
display: block; } }
.account-links {
border-radius: 5px;
@include border-radius(5px);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
position: relative;
&:before {
@ -197,20 +197,13 @@ header {
.account-links a {
&:first-child {
-webkit-border-top-left-radius: 5px;
-webkit-border-top-right-radius: 5px;
-moz-border-radius-topleft: 5px;
-moz-border-radius-topright: 5px;
border-top-left-radius: 5px;
border-top-right-radius: 5px; }
@include border-radius(5px 5px 0 0);
}
&:last-child {
-webkit-border-bottom-right-radius: 5px;
-webkit-border-bottom-left-radius: 5px;
-moz-border-radius-bottomright: 5px;
-moz-border-radius-bottomleft: 5px;
border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px;
border-bottom: 0; } }
@include border-radius(0 0 5px 5px);
border-bottom: 0;
}
}

18
app/assets/stylesheets/sections/login.scss
View file

@ -7,7 +7,7 @@ body.login-page{
.login-box{
width: 304px;
position: relative;
border-radius: 5px;
@include border-radius(5px);
margin: auto;
padding: 20px;
background: white;
@ -18,25 +18,15 @@ body.login-page{
display: block;
}
.login-box input.text{background-color: #f1f1f1; font-size: 16px; border-radius: 0; padding: 14px 10px; width: 280px}
.login-box input.text{background-color: #f1f1f1; font-size: 16px; @include border-radius(0); padding: 14px 10px; width: 280px}
.login-box input.text.top{
-webkit-border-top-left-radius: 5px;
-webkit-border-top-right-radius: 5px;
-moz-border-radius-topleft: 5px;
-moz-border-radius-topright: 5px;
border-top-left-radius: 5px;
border-top-right-radius: 5px;
@include border-radius(5px 5px 0 0);
margin-bottom: 0px;
}
.login-box input.text.bottom{
-webkit-border-bottom-right-radius: 5px;
-webkit-border-bottom-left-radius: 5px;
-moz-border-radius-bottomright: 5px;
-moz-border-radius-bottomleft: 5px;
border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px;
@include border-radius(0 0 5px 5px);
border-top: 0;
margin-bottom: 20px;
}

1
app/assets/stylesheets/sections/merge_requests.scss
View file

@ -34,7 +34,6 @@
border: 1px solid #ADA;
padding: 2px;
@include border-radius(5px);
border-radius: 5px;
background: #CEB;
.accept_merge_request {

14
app/assets/stylesheets/sections/nav.scss
View file

@ -3,7 +3,7 @@
*
*/
ul.main_menu {
border-radius: 4px;
@include border-radius(4px);
margin: auto;
margin: 30px 0;
border: 1px solid #BBB;
@ -26,8 +26,7 @@ ul.main_menu {
color: #777;
background: #f2f2f2;
border-top: 1px solid #CCC;
border-radius: 8px;
-moz-border-radius: 8px;
@include border-radius(8px);
}
.label {
background: $hover;
@ -44,12 +43,7 @@ ul.main_menu {
border-bottom: 2px solid #CFCFCF;
&:first-child{
-webkit-border-top-left-radius: 4px;
-webkit-border-bottom-left-radius: 4px;
-moz-border-radius-topleft: 4px;
-moz-border-radius-bottomleft: 4px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
@include border-radius(5px 0 0 5px);
border-left: 0;
}
@ -57,7 +51,7 @@ ul.main_menu {
background-color: #D5D5D5;
border-right: 1px solid #BBB;
border-left: 1px solid #BBB;
border-radius: 0 0 1px 1px;
@include border-radius(0 0 1px 1px);
&:first-child{
border-bottom: none;
border-left: none;