Skip to content

Checkin styles #645

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

Draft
johnpaulashenfelter wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Checkin styles #645

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
7f8c5d8
Tweaked trackable styles for drag n drop
lmerriam Sep 4, 2016
7223fa2
Active draggable styles
lmerriam Sep 4, 2016
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
14 changes: 8 additions & 6 deletions frontend/app/styles/components/checkin/trackables-step.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,22 @@
.trackable-row {
.draggable-dropzone {
height: 1.5em;
overflow: visible;
&.activated {
height: 5em;
background-color: $lightgrey;
border-radius: 5px;
border: 3px dashed $primary;
background-color: lighten($primary,20%);
border: 2px dashed $primary;
}
&.deactivated {
background-color: white;
background-color: transparent;
}
}
.draggable-item {
&.activated {
border-radius: 5px;
border: 3px dashed $primary;
background: white;
position: relative;
outline: 1px solid $grey;
box-shadow: 0 2px 10px rgba(0,0,0,0.3);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions frontend/app/styles/components/tracked-level.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
li {
position: relative;
display: inline-block;
margin-right: 4px;
border-radius: 5px;
width: 15%;
max-width: 50px;
Expand Down Expand Up @@ -75,6 +74,7 @@
}
h4 {
position: relative;
display: inline;
display: inline-block;
margin-bottom: 10px;
}
}
5 changes: 2 additions & 3 deletions frontend/app/styles/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}

.x-to-remove {
color: $primary;
color: $grey;
margin-left: 5px;
&:hover {
color: $base-font-color;
Expand Down Expand Up @@ -99,9 +99,8 @@ input[type="submit"] {
font-size: 1.1em;
}
.subtitle {
color: $primary;
color: $grey;
font-size: 0.8em;
font-style: italic;
}
}

Expand Down
1 change: 1 addition & 0 deletions frontend/app/styles/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
$background: #F2EEE8;
$primary: #73C1BA;
$lightgrey: #F1EEEE;
$grey: #CACACA;
$indianred: #CD5C5C;
$shadow: #E1D8C8;
$dark-shadow: #C3B399;
Expand Down