Skip to content

Refactor some code #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MarioAraque wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor some code #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions vendor/assets/stylesheets/magic/content/_aside_nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
// mobile first on the bottom
#nav-aside {
display: block; position: fixed;
margin: 0; padding: 0;
right: 0; left: 0; bottom: 0;
@include position(fixed, null 0 0 0);
@include margin(0);
@include padding(0);
display: block;

// Render via GPU (for better scrolling performance)
@include gpu_render;
Expand All @@ -13,8 +14,9 @@
.inner-aside { height: 100%; }

.aside-btn {
@include padding(0);
@include margin(0);
display: block; display: inline-block; position: relative;
margin: 0; padding: 0;
width: $aside-nav-width;
line-height: $aside-nav-btn-height;
text-align: center; vertical-align: middle;
Expand All @@ -39,8 +41,8 @@
}

&.user-pic {
@include padding(0);
height: $aside-nav-avatar-height; max-height: $aside-nav-avatar-height;
padding: 0;
overflow: hidden;
img {
display: block; display: inline-block; position: relative;
Expand All @@ -50,9 +52,10 @@
}

.bubble-counter {
@include padding(0 5px);
@include margin(0);
@include position(absolute, 3px null null 27px);
display: block; position: absolute;
padding: 0 5px; margin: 0;
top: 3px; left: 27px;
line-height: 14px;
font-size: 10px;
background: #cc4246;
Expand All @@ -65,15 +68,15 @@
&.bordered {
.inner-aside { border: solid 1px $aside-nav-border-color; }
.aside-btn {
margin: 0 -1px;
@include margin(0 -1px);
border: solid 1px #ccc;
border-top: solid 1px rgba(255,255,255,.42);
&:active, &.active {
border: solid 1px darken($brand-color, 15%);
@include box-shadow( inset 0 1px 0 0 rgba(255,255,255,.42) );
}
&.user-pic {
margin: -1px -1px 0;
@include margin(-1px -1px 0);
border: solid 1px #ccc;
}
}
Expand Down Expand Up @@ -142,4 +145,4 @@

}

}
}
18 changes: 10 additions & 8 deletions vendor/assets/stylesheets/magic/content/_banner.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
//## Header / Banner
.banner-footer, .banner-header
{
@include margin(0);
@include padding(0);
display: block; position: relative;
margin: 0; padding: 0;
}


.banner-box.press {
margin: 0; padding: 10px 0;
@include margin(0);
@include padding(10px 0);
}

.banner-box.responsive-hero {
padding: 0;
@include padding(0);
& > .corset, & > .container {
padding-top: 20px; padding-bottom: 20px;
&.compact { padding-top: 0; padding-bottom: 0; }
@include padding(20px null);
&.compact { @include padding(0 null); }
}
h1.loud {
@include padding(0);
text-align: center;
color: #fff;
padding: 0;
font-size: 50px;
line-height: 60px;
text-shadow: 0 1px 1px #000;
Expand All @@ -39,12 +41,12 @@
&.fixed-bg { background-attachment:fixed; }

.banner-footer {
padding: 10px 0;
@include padding(10px 0);
background-color: rgba(255,255,255,.30);
z-index: 15;
}
.banner-header {
padding: 10px 0;
@include padding(10px 0);
background-color: rgba(255,255,255,.30);
z-index: 15;
}
Expand Down
23 changes: 13 additions & 10 deletions vendor/assets/stylesheets/magic/content/_box.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,35 @@
.box, .box > .header, .box > .body, .box > .pic {
@include padding(0);
@include margin(0);
display: block; position: relative;
margin: 0; padding: 0;
}

.box {
margin: 0 0 20px; padding: 10px;
@include margin(0 0 20px);
@include padding(10px);
border: solid 1px $main-border-color;
@include border-radius(3px);
text-align: left;
background: #fff;

&.shadow { @include box-shadow( 0 3px 3px 0 rgba(0, 0, 0, 0.20) ); }
&.left-pic { padding-left: 110px; }
&.no-press { margin: 0; }
&.left-pic { @include padding(null null null 110px); }
&.no-press { @include margin(0); }
&.blur { background: rgba(255,255,255,.42); }

& > .pic {
margin: 0 10px 0 -100px;
@include margin(0 10px 0 -100px);
width: 100px;
float: left;
border: solid 1px $main-border-color;
}
& > .header {
padding: 5px 10px 5px;
@include padding(5px 10px 5px);
border-bottom: solid 1px $main-border-color;

&, h1, h2, h3, h4, h5, h6, p, span, .h1, .h2, .h3, .h4, .h5, .h6 {
margin: 0; padding: 0 5px 2px;
@include margin(0);
@include padding(0 5px 2px);
color: $brand-color;
line-height: 27px;
font-size: 18px;
Expand All @@ -35,13 +38,13 @@
&.blank { border-bottom: solid 1px transparent; }
i, i:before {
color: #999;
margin-right: 2px;
@include margin(null 2px null null);
}
}
.pic + .header { padding-left: 0; margin-left: 10px; }

& > .body {
padding: 10px 10px 5px;
@include padding(10px 10px 5px);
}
}

Expand Down Expand Up @@ -126,4 +129,4 @@
.feature-heading { font-size: 25px; margin: 0 0 10px; }
p.loud, p.highlight { font-size: 15px; }
}
}
}
9 changes: 5 additions & 4 deletions vendor/assets/stylesheets/magic/content/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@


.btn-splited, .btn-divided {
@include margin(0);
@include padding(0);
display: table;
width: auto;
width: 100%;
// margin: 0 0 10px;
margin: 0; padding: 0;
& > * {
display: table-cell; position: relative;
padding: $padding-base-vertical $padding-base-horizontal;
Expand Down Expand Up @@ -80,10 +81,10 @@

// Vertically space out multiple block buttons
.btn-block + .btn-block {
margin-top: 10px;
@include margin(10px null null null);
}
.btn-splited + .btn-splited, .btn-splited + .btn-divided, .btn-divided + .btn-splited, .btn-divided + .btn-divided {
margin-top: 10px;
@include margin(10px null null null);
}


Expand Down Expand Up @@ -246,4 +247,4 @@

&.half { width: 50%; margin-left: auto; margin-right: auto; }
&:hover { text-decoration: none !important; }
}
}
32 changes: 18 additions & 14 deletions vendor/assets/stylesheets/magic/content/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
//## Signup/Login Forms
//
.centered-form {
@include padding(15px);
@include margin(10px auto);
text-align: center;
max-width: 350px;
padding: 15px;
margin: 10px auto;
h2 { margin: 0 0 15px; }
h2 { @include margin(0 0 15px); }
.form-control {
position: relative;
@include placeholder { color: #ccc; }
}
.btn:last-child {
margin: 20px 0 0;
@include margin(20px 0 0);
}
}

.inpt-group {
@include margin(0 0 20px);
@include padding(0);
display: block; position: relative;
margin: 0 0 20px; padding: 0;
.form-control {
position: relative;
margin: 0 0 -1px !important;
Expand Down Expand Up @@ -68,8 +69,9 @@

form.corset, .form {
label {
@include margin(0);
@include padding(7px 0);
display: block; position: relative;
margin: 0; padding: 7px 0;
line-height: 20px;
text-align:left;
}
Expand All @@ -78,12 +80,14 @@ form.corset, .form {

// Inputs with Icons (orderlifticons)
.icon_field {
@include margin(0);
@include padding(0);
display: block; position: relative;
margin: 0; padding: 0;
&:after {
display: block; position: absolute;
margin: 0; padding: 0;
left: 2px; top: 0; bottom: 0;
@include margin(0);
@include padding(0);
@include position(absolute, 0 null 2px 0);
display: block;
width: 24px; line-height: 34px;
text-align: center; vertical-align: middle;
content: "\e003";
Expand All @@ -102,11 +106,11 @@ form.corset, .form {
// color: rgba(0,0,0,.20);
// }
// }
input, input.form-control { padding-left: 28px; }
&.half { width: 50%; margin: 0 auto; }
input, input.form-control { @include padding(null null null 28px); }
&.half { @include margin(0 auto); width: 50%; }
&.fat {
input {
padding: 11px 20px 9px 34px;
@include padding(11px 20px 9px 34px);
height: 42px;
font-size: 18px;
@include placeholder {
Expand Down Expand Up @@ -176,7 +180,7 @@ form.corset, .form {
}

.form-control + .form-control {
margin-top: 10px;
@include margin(10px null null null);
}


Expand Down
14 changes: 7 additions & 7 deletions vendor/assets/stylesheets/magic/content/_icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
.feature-icon {
margin: 0 auto;
@include margin(0 auto);
@include size($that_size $that_size);
$that_size: 90px;
width: $that_size; height: $that_size;
@include border-radius($that_size);
border: solid 5px transparentize($orange, 0.5);
img { max-width: 80%; margin: 10%; }
img { @include margin(10%); max-width: 80%; }
i {
display:block; position: absolute;
top: -1px; right: -4px;
@include position(absolute, -1px -4px null null);
@include size(24px 24px);
display:block;
background: $orange;
color: #fff;
@include border-radius(20px);
width: 24px; height: 24px;
line-height: 24px;
font-size: 18px;
}
}
}
13 changes: 7 additions & 6 deletions vendor/assets/stylesheets/magic/content/_inputs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
$input-height: $input-height + 1;
&#{$parent} > * { height: $input-height; }
&#{$parent} > .icn {
@include padding($padding-vertical 2px);
height: $input-height;
max-height: $input-height;
font-size: $font-size * 1.2;
padding: $padding-vertical 2px;
line-height: floor(($font-size * $line-height));
@include inpt_icn_width( ($font-size * $line-height), $padding-base-vertical );
}
&#{$parent} > .inpt > input {
@include padding($padding-vertical $padding-horizontal $padding-vertical 5px);
height: $input-height;
padding: $padding-vertical $padding-horizontal $padding-vertical 5px;
font-size: $font-size;
line-height: $line-height;
border-radius: $border-radius;
Expand Down Expand Up @@ -49,8 +49,9 @@
@include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s);

& > * {
@include padding(0);
@include margin(0);
display: table-cell; position: relative;
padding: 0; margin: 0;

height: $input-height-base + 1;
font-size: inherit;
Expand All @@ -72,10 +73,10 @@

&.inpt {
input, label, textarea {
@include margin(0);
@include size(100% $input-height-base + 1);
display: block; position: relative;
padding: $padding-base-vertical $padding-base-horizontal $padding-base-vertical 5px;
margin: 0;
height: $input-height-base + 1;
@include box-sizing(border-box);
border: none;
@include box-shadow( none );
Expand All @@ -85,10 +86,10 @@
}

&.icn {
@include padding($padding-base-vertical 2px);
width: 2%;
font-size: $font-size-base * 1.2;
line-height: $line-height-computed;
padding: $padding-base-vertical 2px;
text-align: center;
color: lighten($input-color, 20%);
@include inpt_icn_width( $line-height-computed, $padding-base-vertical );
Expand Down
Loading