Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

Refactoring things #7

Merged
merged 4 commits into from
Dec 4, 2014
Merged

Refactoring things #7

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3bda71
refactored margin, padding, removed comments from _card
Dec 4, 2014
b87a8fe
adding some focus states bc accesibility
Dec 4, 2014
a5ec957
just a bit more cleanup
Dec 4, 2014
b49ccd0
fixed a typo where I had margin-top instead of margin
Dec 4, 2014
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
10 changes: 2 additions & 8 deletions material-ui/components/_card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,12 @@

background-color: $white;
padding: $card-padding;
//.border-radius;

.mui-card-toolbar {
margin-top: ($card-padding * -1);
margin-left: ($card-padding * -1);
margin-right: ($card-padding * -1);
margin-bottom: $card-padding;
//border-bottom: solid 1px $border-color;
margin-top: ($card-padding * -1) ($card-padding * -1) ($card-padding * -1) $card-padding;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@una did you mean here margin, or does margin-top accept 4 values? I'd use:

margin: ($card-padding * -1) ($card-padding * -1) ($card-padding * -1) $card-padding;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch. definitely meant margin

line-height: 56px;
height: 56px;
padding-left: $card-padding;
padding-right: $card-padding;
padding-left: 0 $card-padding;
@extend .mui-font-style-menu;
}
}
28 changes: 17 additions & 11 deletions material-ui/components/_drop-down-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
.mui-drop-down-menu {

* { @include ease-out(); }
* {
@include ease-out();
}

position: relative;
display: inline-block;
height: $desktop-toolbar-height;
font-size: $desktop-drop-down-menu-font-size;

&.mui-open {
.mui-menu-control,
.mui-menu-control:hover {
.mui-menu-control-bg {
opacity: 0;
}
.mui-menu-label {
top: ($desktop-toolbar-height / 2);
opacity: 0;
.mui-menu-control {
&:hover,
&:focus {

.mui-menu-control-bg {
opacity: 0;
}

.mui-menu-label {
top: ($desktop-toolbar-height / 2);
opacity: 0;
}
}
}

Expand All @@ -36,7 +42,8 @@
opacity: 0;
}

&:hover {
&:hover,
&:focus {
.mui-menu-control-bg {
opacity: 1;
}
Expand Down Expand Up @@ -72,5 +79,4 @@
white-space: nowrap;
}
}

}
9 changes: 6 additions & 3 deletions material-ui/components/_raised-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
color: $raised-button-disabled-text-color;
}

&:hover {
&:hover,
&:focus {
background-color: $raised-button-disabled-color;
}
}
Expand All @@ -59,7 +60,8 @@
color: $raised-button-text-color;
}

&:hover {
&:hover,
&:focus {
.mui-raised-button-container {
background-color: $raised-button-hover-color;
}
Expand Down Expand Up @@ -88,7 +90,8 @@
}
}

&:hover {
&:hover,
&:focus {
.mui-raised-button-container {
background-color: $raised-button-primary-hover-color;
}
Expand Down
4 changes: 1 addition & 3 deletions material-ui/components/_ripple.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
.mui-ripple {
position: absolute;

top: 50%;
left: 50%;
width: 0;
height: 0;

transform: translate(-50%, -50%);
border-radius: 50%;
}
}
7 changes: 0 additions & 7 deletions material-ui/components/_table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,30 @@
$column-width: 200px;

.mui-table {
//background-color: darken(green, 10%);
padding: 0 $desktop-gutter;

.mui-table-header {
//background-color: green;

.mui-table-header-column {
display: inline-block;
height: 48px;
line-height: 48px;
//background-color: lighten(green, 10%);
width: $column-width;
}

.mui-table-header-pagify {
display: inline-block;
//background-color: lighten(green, 25%);
height: 48px;
line-height: 48px;
float: right;
}
}

.mui-table-rows {
//background-color: lighten(green, 20%);

.mui-table-rows-item {
height: 48px;
line-height: 48px;
//background-color: lighten(green, 30%);
display: block;
width: 100%;
}
Expand All @@ -39,7 +33,6 @@ $column-width: 200px;
height: 48px;
line-height: 48px;
display: inline-block;
//background-color: lighten(green, 25%);
float: right;
}
}
Expand Down
55 changes: 27 additions & 28 deletions material-ui/components/_toast.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,44 +20,43 @@ $mui-toast-icon-vertical-align : middle;
$mui-toast-position : relative;

.mui-toast {
color : $mui-toast-color;
background-color: $mui-toast-background-color;
border-radius : $mui-toast-border-radius;
padding : $mui-toast-padding;
margin : $mui-toast-margin;
height : $mui-toast-height;
line-height : $mui-toast-height;
min-width : $mui-toast-min-width;
max-width : $mui-toast-max-width;
position : absolute;
bottom : -8px;
left : 0;
opacity : 0;
color : $mui-toast-color;
background-color: $mui-toast-background-color;
border-radius : $mui-toast-border-radius;
padding : $mui-toast-padding;
margin : $mui-toast-margin;
height : $mui-toast-height;
line-height : $mui-toast-height;
min-width : $mui-toast-min-width;
max-width : $mui-toast-max-width;
position : absolute;
bottom : -8px;
left : 0;
opacity : 0;

.mui-toast-message {
padding-right: $mui-toast-message-padding-right;
}

.mui-toast-action {
line-height : $mui-toast-height;
color : $mui-toast-action-color;
cursor : $mui-toast-action-cursor;
font-weight : $mui-toast-action-font-weight;
text-transform: $mui-toast-action-text-transform;
float : $mui-toast-action-float;
margin-left : $mui-toast-action-margin-left;
line-height : $mui-toast-height;
color : $mui-toast-action-color;
cursor : $mui-toast-action-cursor;
font-weight : $mui-toast-action-font-weight;
text-transform: $mui-toast-action-text-transform;
float : $mui-toast-action-float;
margin-left : $mui-toast-action-margin-left;
}

.mui-icon {
line-height : $mui-toast-icon-line-height;
position : $mui-toast-position;
top : $mui-toast-fix-top;
vertical-align: $mui-toast-icon-vertical-align;
line-height : $mui-toast-icon-line-height;
position : $mui-toast-position;
top : $mui-toast-fix-top;
vertical-align: $mui-toast-icon-vertical-align;
}

&.mui-open {
bottom : 0;
opacity: 1;
bottom : 0;
opacity: 1;
}

}
}