Skip to content

Commit

Permalink
Bump stylelint-config-xo-space
Browse files Browse the repository at this point in the history
  • Loading branch information
sindresorhus committed Nov 3, 2017
1 parent 573f5fd commit c002d6d
Show file tree
Hide file tree
Showing 18 changed files with 485 additions and 338 deletions.
16 changes: 8 additions & 8 deletions app/src/renderer/css/_base.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,34 @@

/* Set base colour and font stack */
body {
color: $color-primary;
font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue';
overflow: hidden;
letter-spacing: -0.01rem;
border-radius: 5px;
color: $color-primary;
font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue';
font-size: 1.4rem;
letter-spacing: -0.01rem;
}

.container {
display: flex;
padding-left: 16px;
padding-right: 16px;
padding-left: 16px;
}

.row {
margin-left: -16px;
margin-right: -16px;
margin-left: -16px;
}

.col {
padding-left: 16px;
padding-right: 16px;
padding-left: 16px;
}

.content {
background-color: $background-primary;
display: flex;
flex-direction: column;
overflow: hidden;
position: relative;
flex-direction: column;
background-color: $background-primary;
}
4 changes: 2 additions & 2 deletions app/src/renderer/css/_helpers.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

/* Allow element to be held down to drag the current window */
.webkit-drag {
-webkit-app-region: drag;
cursor: -webkit-grab;
-webkit-app-region: drag;
}

.a-width--full {
Expand All @@ -28,8 +28,8 @@


.txt {
-webkit-user-select: none !important;
cursor: default !important;
-webkit-user-select: none !important;
}

.u-border-bottom--lighter {
Expand Down
20 changes: 10 additions & 10 deletions app/src/renderer/css/_variables.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,32 @@
Colors
*/
/* Blue */
$blue: #007AFF;
$blue-dark: #004BA4;
$blue: #007aff;
$blue-dark: #004ba4;
/* Gray */
$gray-lightest: #F9F9F9;
$gray-lighter: #F1F1F1;
$gray-light: #DDD;
$gray-dark: #CCC;
$gray-lightest: #f9f9f9;
$gray-lighter: #f1f1f1;
$gray-light: #ddd;
$gray-dark: #ccc;
$gray-darker: #808080;
$gray-darkest: #404040;
$black: #111;

/* Red */
$red: #FF6059;
$red: #ff6059;
/* Green */
$green: #28CA42;
$green: #28ca42;

/* Typography */
$font-size-default: 1.4rem;

/* Backgrounds */
$background-primary: #FFF;
$background-primary: #fff;
$background-secondary: $gray-darker;

/* Typography */
$color-primary: $black;
$color-light: #FFF;
$color-light: #fff;
$divider-color: $gray-lighter;
$box-shadow-inputs: 0 1px 1px 0 rgba(0, 0, 0, 0.2),
0 0 0 1px rgba(0, 0, 0, 0.1);
Expand Down
121 changes: 73 additions & 48 deletions app/src/renderer/css/components/_buttons.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,115 +8,140 @@
*/

/* Ensure all buttons have the pointer cursor */
.btn { cursor: pointer }
.btn {
cursor: pointer;
}

/* Button */
*[class^="button"] {
*[class^='button'] {
height: 2.4rem;
line-height: 2.4rem;
padding: 0 1.6rem;
border: 1px solid #ddd;
border-radius: 4px;
color: $color-primary;
border: 1px solid #DDD;
cursor: pointer;
text-align: center;
font-size: 1.2rem;
text-align: center;
line-height: 2.4rem;
cursor: pointer;
}


/*
Button Group
*/
.button-group {
position: relative;
display: flex;
overflow: hidden;
height: 2.4rem;
padding: 0;
border-radius: 4px;
height: 2.4rem;
display: flex;
position: relative;
justify-content: space-around;
background-color: white;
overflow: hidden;
background-color: #fff;

&--large {
height: 3.2rem;

*[class^="button"] { height: 3.2rem; }
*[class^='button'] {
height: 3.2rem;
}
}

.active-shim {
position: absolute;
background: $blue;
z-index: 0;
left: 0;
transition: .2s cubic-bezier(.37,1.12,.18,1);
transition-property: transform, border-radius;
position: absolute;
left: 0;
z-index: 0;
background: $blue;
transition: 0.2s cubic-bezier(0.37, 1.12, 0.18, 1);
transition-property: transform, border-radius;
}

*[class^="button"] {
flex: 1 1 1%;
background: transparent;
border: 0;
height: 100%;
*[class^='button'] {
display: flex;
height: 100%;
padding: 0;
border: 0;
border-radius: 0;
flex: 1 1 1%;
align-items: center;
justify-content: center;
background: transparent;
box-shadow: none;
border-radius: 0;
transition: background .12s ease-in-out;
transition: background 0.12s ease-in-out;

&.is-active {
background: #F9F9F9;
background: #f9f9f9;

svg { fill: $blue; }
svg {
fill: $blue;
}
}

&:first-child { border-radius: 4px 0 0 4px; }
&:last-child { border-radius: 0 4px 4px 0; }
&:not(:last-child) { border-right: 1px solid #DDD; }
&:first-child {
border-radius: 4px 0 0 4px;
}

&:last-child {
border-radius: 0 4px 4px 0;
}

&:not(:last-child) {
border-right: 1px solid #ddd;
}

&:hover {
background: white;
background: #fff;

&:not(:active):not(.is-active) {
svg { fill: $blue; }
/* stylelint-disable-next-line max-nesting-depth */
svg {
fill: $blue;
}
}
}

span {
padding: 0 1.6rem;
min-width: 4.8rem;
padding: 0 1.6rem;
z-index: 1;
}
}

svg {
@extend .btn;
height: 2.4rem;
width: 2.4rem;
height: 2.4rem;
transition: fill 0.12s ease-in-out;
fill: #919191;
transition: fill .12s ease-in-out;
}

&.is-light {
background: #F9F9F9;
background: #f9f9f9;
box-shadow: $box-shadow-inputs, 0 1px rgba(255, 255, 255, 1);

svg { fill: #8C8C8C; }
svg {
fill: #8c8c8c;
}
}

&.is-transparent {
border: 1px solid rgba(255, 255, 255, 0.1);
background: transparent;
border: 1px solid rgba(255, 255, 255, .1);

.active-shim { background: rgba(255, 255, 255, .1); }
.active-shim {
background: rgba(255, 255, 255, 0.1);
}

*[class^="button"] {
color: white;
*[class^='button'] {
border-color: transparent;
color: #fff;

&:hover {
background: transparent;
}

&:hover { background: transparent; }
&:hover:not(:focus) {
background: rgba(255, 255, 255, .2);
background: rgba(255, 255, 255, 0.2);
}
}
}
Expand All @@ -125,20 +150,20 @@
button {
&:disabled,
&.disabled {
pointer-events: none;
opacity: 0.5;
pointer-events: none;
}
}

.button--primary {
background: #3B99FC;
border-color: #2D91FC;
border-color: #2d91fc;
background: #3b99fc;
}

.button--secondary {
background: white;
border: 1px solid $gray-light;
transition: border .12s ease-in-out;
background: #fff;
transition: border 0.12s ease-in-out;

&:hover {
border-color: $blue;
Expand Down
Loading

0 comments on commit c002d6d

Please sign in to comment.