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

Add variable for border-radius and box-shadow #6688

Merged
merged 1 commit into from
Nov 3, 2017
+22 −21
Merged

Add variable for border-radius and box-shadow #6688

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
2 changes: 1 addition & 1 deletion apps/comments/css/autocomplete.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
background: $color-main-background;
color: $color-main-text;
border: 1px solid $color-border;
border-radius: 3px;
border-radius: $border-radius;
box-shadow: 0 0 5px $color-box-shadow;
min-width: 120px;
z-index: 11110 !important;
Expand Down
2 changes: 1 addition & 1 deletion apps/files/css/files.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ table.dragshadow td.size {

.quota-container {
height: 5px;
border-radius: 3px;
border-radius: $border-radius;

div {
height: 100%;
Expand Down
4 changes: 2 additions & 2 deletions core/css/apps.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ kbd {
padding: 4px 10px;
border: 1px solid #ccc;
box-shadow: 0 1px 0 rgba(0, 0, 0, .2);
border-radius: 3px;
border-radius: $border-radius;
display: inline-block;
white-space: nowrap;
}
Expand Down Expand Up @@ -767,7 +767,7 @@ kbd {
position: absolute;
background-color: $color-main-background;
color: $color-main-text;
border-radius: 3px;
border-radius: $border-radius;
z-index: 110;
margin: 5px;
margin-top: -5px;
Expand Down
2 changes: 1 addition & 1 deletion core/css/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ nav {
background-color: rgba($color-main-background, .97);
white-space: nowrap;
border: none;
border-radius: 3px;
border-radius: $border-radius;
border-top-left-radius: 0;
border-top-right-radius: 0;
margin-top: 0;
Expand Down
12 changes: 6 additions & 6 deletions core/css/inputs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ div[contenteditable=true],
color: nc-lighten($color-main-text, 33%);
border: 1px solid nc-darken($color-main-background, 14%);
outline: none;
border-radius: 3px;
border-radius: $border-radius;
cursor: text;
&:not(:disabled):not(.primary) {
&:hover,
Expand Down Expand Up @@ -372,7 +372,7 @@ input {
background: $color-main-background;
color: nc-lighten($color-main-text, 33%);
box-sizing: content-box;
border-radius: 3px;
border-radius: $border-radius;
border: 1px solid nc-darken($color-main-background, 14%);
margin: 0;
padding: 2px 0;
Expand Down Expand Up @@ -417,7 +417,7 @@ input {
background: $color-main-background;
color: nc-lighten($color-main-text, 33%);
box-sizing: content-box;
border-radius: 3px;
border-radius: $border-radius;
border: 1px solid nc-darken($color-main-background, 14%);
margin: 0;
padding: 2px 0;
Expand Down Expand Up @@ -465,7 +465,7 @@ progress {
padding: 0;
border: 0 none;
background-color: nc-darken($color-main-background, 10%);
border-radius: 3px;
border-radius: $border-radius;
flex-basis: 100%;
height: 5px;
overflow: hidden;
Expand All @@ -481,12 +481,12 @@ progress {
background: transparent;
}
&::-moz-progress-bar {
border-radius: 3px;
border-radius: $border-radius;
background: $color-primary;
transition: 250ms all ease-in-out;
}
&::-webkit-progress-value {
border-radius: 3px;
border-radius: $border-radius;
background: $color-primary;
transition: 250ms all ease-in-out;
}
Expand Down
2 changes: 1 addition & 1 deletion core/css/jquery.ocdialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.oc-dialog {
background: $color-main-background;
color: nc-darken($color-main-text, 20%);
border-radius: 3px;
border-radius: $border-radius;
box-shadow: 0 0 7px $color-box-shadow;
padding: 15px;
z-index: 10000;
Expand Down
10 changes: 5 additions & 5 deletions core/css/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ body {

::-webkit-scrollbar-thumb {
background: nc-darken($color-main-background, 14%);
border-radius: 3px;
border-radius: $border-radius;
}

/* Searchbox */
Expand All @@ -181,7 +181,7 @@ body {
background: transparent url('../img/actions/search-white.svg?v=1') no-repeat 6px center;
color: $color-primary-text;
border: 0;
border-radius: 3px;
border-radius: $border-radius;
margin-top: 3px;
width: 0;
cursor: pointer;
Expand Down Expand Up @@ -648,7 +648,7 @@ label.infield {
background-color: rgba($color-main-text, 0.3);
color: $color-primary-text;
text-align: left;
border-radius: 3px;
border-radius: $border-radius;
cursor: default;
}
.update {
Expand All @@ -675,7 +675,7 @@ label.infield {
margin-top: 8px;
padding: 5px;
background: rgba($color-error, .15);
border-radius: 3px;
border-radius: $border-radius;
}

.warning {
Expand Down Expand Up @@ -991,7 +991,7 @@ code {
margin-top: 10px;
padding: 4px 8px;
width: auto;
border-radius: 3px;
border-radius: $border-radius;
border: none;

.ui-state-default,
Expand Down
2 changes: 1 addition & 1 deletion core/css/tooltip.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
color: $color-main-text;
box-shadow: 0 1px 10px $color-box-shadow;
text-align: center;
border-radius: 3px;
border-radius: $border-radius;
}

.tooltip-arrow {
Expand Down
1 change: 1 addition & 0 deletions core/css/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ $color-loading: #969696;
$color-loading-dark: #bbbbbb;
$color-box-shadow: rgba(nc-darken($color-main-background, 30%), 0.75);
$color-border: nc-darken($color-main-background, 8%);
$border-radius: 3px;
6 changes: 3 additions & 3 deletions settings/css/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ input {
transform: translate(-50%, -50%);
background: #fff;
color: #333;
border-radius: 3px;
border-radius: $border-radius;
box-shadow: 0 0 7px #888;
padding: 15px;
.jcrop-holder {
Expand Down Expand Up @@ -716,7 +716,7 @@ span.version {
color: #555;
background-color: transparent;
border: 1px solid #555;
border-radius: 3px;
border-radius: $border-radius;
padding: 3px 6px;
}
a {
Expand Down Expand Up @@ -1103,7 +1103,7 @@ table.grid td.date {
span {
&.success {
background: #37ce02;
border-radius: 3px;
border-radius: $border-radius;
}
&.error {
background: #ce3702;
Expand Down