Skip to content
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

Jump to bottom

Refresh aesthetics of admin interface #507

Merged
merged 2 commits into from
Oct 7, 2019
Merged

Refresh aesthetics of admin interface #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d82fd2
Refresh aesthetics of admin interface
ashmaroli Oct 6, 2019
58666d5
Remove outdated mixins
ashmaroli Oct 7, 2019
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
5 changes: 2 additions & 3 deletions src/styles/breadcrumbs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
.breadcrumbs {
margin: 0 30px 10px 0;
list-style: none;
margin: 0 30px 0 0;
padding: 0;
list-style: none;
li {
float: left;
position: relative;
&:not(:last-child):after {
content: "/";
padding: 0 8px;
Expand Down
7 changes: 3 additions & 4 deletions src/styles/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
padding: 12px 20px;
white-space: nowrap;
text-shadow: 1px 1px 1px rgba(68, 68, 68, 0.2);
@include border-radius($border-radius);
@include box-sizing(border-box);
border-radius: 4px;
@include btn($btn-initial, $btn-initial-border);
i {
margin-right: 4px;
Expand All @@ -24,7 +23,7 @@

.btn-thin {
padding: 8px;
margin: 5px;
margin: 0 5px;
}

.btn-active {
Expand All @@ -39,7 +38,7 @@
@include btn($btn-success, $btn-success-border, pointer);
&:hover {
background-color: lighten($btn-success, 5%) !important;
@include box-shadow(0 1px 0 $btn-success-border);
box-shadow: 0 1px 0 $btn-success-border;
}
}

Expand Down
51 changes: 17 additions & 34 deletions src/styles/content.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,26 @@
table {
width: 100%;
background-color: #f2f2f2;
margin: .5em 0;
font-size: 18px;
@include border-radius($border-radius);
@include box-shadow(0 1px 3px rgba(0,0,0,.3));
margin: 0.5em 0;
border: 1px solid $border-color;
border-radius: $border-radius;
}

thead {
@include border-top-left-radius($border-radius);
@include border-top-right-radius($border-radius);
color: #fff;
background-color: #3a3a3a;
background-image: -webkit-gradient(linear, left top, left bottom, from(#3a3a3a), to(#1e1e1e));
background-image: -webkit-linear-gradient(top, #3a3a3a 0%, #1e1e1e 100%);
background-image: -moz-linear-gradient(top, #3a3a3a 0%, #1e1e1e 100%);
background-image: -o-linear-gradient(top, #3a3a3a 0%, #1e1e1e 100%);
background-image: linear-gradient(to bottom, #3a3a3a 0%,#1e1e1e 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#3a3a3a', endColorstr='#1e1e1e',GradientType=0 );
background-color: #333;
border: 1px solid #333;

th {
text-align: left;
position: relative;
@include box-shadow(inset 0 1px 0 rgba(255,255,255,.1));

&:first-child {
@include border-top-left-radius($border-radius);
border-top-left-radius: $border-radius;
}

&:last-child {
@include border-top-right-radius($border-radius);
border-top-right-radius: $border-radius;
}
}
}
Expand All @@ -44,9 +35,9 @@
th {
text-transform: uppercase;
font-size: 16px;
padding: .5em .75em;
padding: 12px;
text-shadow: 0 -1px 0 rgba(0,0,0,.9);
color: #888;
color: #ddd;
}

th.th-actions {
Expand All @@ -55,16 +46,10 @@
}

tbody td {
padding: 20px 12px;
height: 63px;
padding: 15px 0.75em;
vertical-align: middle;
border-top: 1px solid rgba(0,0,0,.1);
@include box-shadow(inset 0 1px 0 rgba(255,255,255,.1));
background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(255,255,255,0.1)), to(rgba(255,255,255,0)));
background-image: -webkit-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%);
background-image: -moz-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%);
background-image: -o-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%);
background-image: linear-gradient(to bottom, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1affffff', endColorstr='#00ffffff',GradientType=0 );
border-top: 1px solid $border-color;
}

td.row-title {
Expand All @@ -79,8 +64,6 @@

td .row-actions {
float: right;
min-width: 96px;
font-size: 16px;
}
}

Expand All @@ -94,7 +77,7 @@
h1 {
margin: 0 40px 0 0;
float: left;
text-shadow: 1px 1px 1px rgba(68, 68, 68, 0.3);
text-shadow: 1px 1px 1px rgba(68, 68, 68, 0.21);
}
.page-buttons {
display: flex;
Expand Down Expand Up @@ -143,7 +126,7 @@
}
.side-link {
text-align: center;
@include border-radius($border-radius);
border-radius: $border-radius;
margin-bottom: 10px;
width: 100%;
display: inline-block;
Expand Down Expand Up @@ -175,7 +158,7 @@

.splitter {
margin: 15px 0;
background: #cfcfcf;
background: $border-color;
border: 0;
}

Expand All @@ -193,8 +176,8 @@
color: $white;
text-align: center;
background: $dark-gray;
@include border-radius($border-radius);
@include box-shadow(0px 2px 8px 2px rgba(0, 0, 0, 0.08));
border-radius: $border-radius;
box-shadow: 0px 2px 8px 2px rgba(0, 0, 0, 0.08);
&:after {
content: "";
position: absolute;
Expand Down
51 changes: 26 additions & 25 deletions src/styles/datagui.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
margin-bottom: 40px;
padding: 30px;
background: #222;
border-radius: $border-radius;
.metafield {
position: relative;
margin-bottom: 5px;
Expand All @@ -10,16 +11,16 @@
color: #eb2659;
.key-field {
max-width: 190px;
min-height: 46px;
min-height: 42px;
margin: 0 0 10px;
padding: 11px 10px;
padding: 8px 10px;
font-size: 16px;
font-weight: 700;
line-height: 1.5;
color: #eb2659;
background: #2b2b2b;
border: 1px solid transparent;
@include border-radius(2px);
border-radius: $border-radius;
@include transition(color 250ms ease);
&:focus {
color: #eaeaea !important;
Expand All @@ -41,12 +42,12 @@
.meta-value {
.value-field {
width: 100%;
min-height: 46px;
min-height: 42px;
height: auto;
max-height: 500px;
overflow: hidden;
margin-bottom: 10px;
padding: 11px 13px;
padding: 8px 10px;
font-size: 16px;
line-height: 1.5;
color: #eaeaea;
Expand All @@ -55,7 +56,7 @@
resize: vertical;
background: #2b2b2b;
border: 1px solid transparent;
@include border-radius(2px);
border-radius: $border-radius;
@include transition(color 250ms ease);
&:focus {
border-color: $dark-orange;
Expand All @@ -75,14 +76,14 @@
position: absolute;
top: 0;
right: 0;
height: 48px;
height: 42px;
pointer-events: auto;
button {
display: inline-block;
min-width: 48px;
min-width: 42px;
height: 100%;
margin: 0;
padding: 0;
padding: 0 3px 0 0;
color: #818181;
line-height: 2.286em;
text-align: center;
Expand All @@ -108,10 +109,10 @@
margin-right: auto;
margin-bottom: 20px;
margin-left: 36px;
padding: 10px 15px;
padding: 8px 10px;
pointer-events: auto;
border: 1px solid #383838;
@include border-radius(2px);
border-radius: $border-radius;
.array-item-wrap {
margin-bottom: 5px;
.array-header {
Expand Down Expand Up @@ -146,7 +147,7 @@
text-align: center;
color: white;
background: $dark-orange;
@include border-radius(50%);
border-radius: 50%;
i {
margin: 0;
}
Expand All @@ -165,12 +166,12 @@
margin-bottom: 10px;
input {
width: 100%;
min-height: 48px;
padding: 11px 55px 10px 11px;
min-height: 42px;
padding: 8px 55px 8px 10px;
font-size: 16px;
line-height: 1.5;
pointer-events: auto;
@include border-radius(2px);
border-radius: $border-radius;
}
.meta-buttons {
position: absolute;
Expand Down Expand Up @@ -223,7 +224,7 @@
}
.meta-buttons {
position: absolute;
top: 4px;
top: 12px;
right: 0;
z-index: 8;
span.move {
Expand All @@ -246,7 +247,7 @@
text-align: center;
outline: none;
border: 2px solid #575757;
@include border-radius(50%);
border-radius: 50%;
&:hover, &:focus {
color: white;
background: $dark-orange;
Expand All @@ -272,7 +273,7 @@
transform: translateX(-50%);
z-index: 30;
border: 1px solid #323232;
@include border-radius(2px);
border-radius: $border-radius;
&:before {
position: absolute;
top: -10px;
Expand Down Expand Up @@ -331,7 +332,7 @@
right: 0;
pointer-events: auto;
.value-field {
width: calc(100% - 50px);
width: calc(100% - 44px);
}
}
>.date-field {
Expand All @@ -349,7 +350,7 @@
right: 36px;
width: calc(100% - 227px);
.value-field {
width: calc(100% - 65px);
width: calc(100% - 59px);
margin-left: 15px;
}
}
Expand All @@ -361,7 +362,7 @@
right: 0;
width: 100%;
.value-field {
width: calc(100% - 50px);
width: calc(100% - 44px);
}
}
.date-field {
Expand All @@ -378,7 +379,7 @@
width: calc(100% - 190px);
pointer-events: auto;
.value-field {
width: calc(100% - 65px);
width: calc(100% - 59px);
margin-left: 15px;
}
}
Expand Down Expand Up @@ -411,14 +412,14 @@
pointer-events: auto;
background: #222;
&.rw-widget {
@include border-radius(2px);
border-radius: $border-radius;
border-color: transparent;
}
input {
padding: 11px 13px;
width: calc(100% - 3px);
min-height: 46px;
@include border-radius(2px);
min-height: 40px;
border-radius: $border-radius;
color: white;
background: #2b2b2b;
}
Expand Down
2 changes: 1 addition & 1 deletion src/styles/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.config-editor {
border: 1px solid $border-color;
@include border-radius($border-radius);
border-radius: $border-radius;
outline: none;
font-size: 14px;
}
Expand Down
Loading