Skip to content

Commit

Permalink
Merge e50a7ed into d2be83c
Browse files Browse the repository at this point in the history
  • Loading branch information
acdha committed Jun 21, 2019
2 parents d2be83c + e50a7ed commit cc2b8ec
Show file tree
Hide file tree
Showing 6 changed files with 140 additions and 128 deletions.
5 changes: 5 additions & 0 deletions .stylelintrc.yaml
@@ -1,5 +1,10 @@
extends:
- stylelint-config-recommended
- stylelint-config-prettier

plugins:
- stylelint-value-no-unknown-custom-properties

rules:
no-descending-specificity: null
csstools/value-no-unknown-custom-properties: true
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -35,5 +35,6 @@ script:
- git fetch --unshallow
- git diff --name-only $TRAVIS_COMMIT_RANGE | xargs pipenv run pre-commit run --files
- pipenv run safety check
- npx --quiet csstree-validator static/css/
after_success:
- 'if [[ $TRAVIS_PYTHON_VERSION == "3.7" ]]; then git fetch --unshallow --tags; pipenv run coverage xml; sonar-scanner -Dsonar.projectVersion="$(pipenv run python setup.py --version)"; coveralls; fi'
1 change: 0 additions & 1 deletion concordia/static/scss/action-app.scss
Expand Up @@ -80,7 +80,6 @@ main {
.concordia-app-input-group-text {
font-weight: bold;
border: none;
background-color: none;
}

.concordia-app-range-min {
Expand Down
50 changes: 9 additions & 41 deletions concordia/static/scss/base.scss
@@ -1,6 +1,7 @@
:root {
--primary-color: #f05129;
--primary-color-hover: rgba(188, 57, 1, 1); /* #BC3901 */
--secondary-color: rgba(0, 167, 228, 1); /* #00A7E4 */
--color-success: rgba(22, 201, 74, 1); /* #16C94A */
--color-danger: rgba(254, 12, 11, 1); /* #FE0C0B */
--color-warning: rgba(254, 153, 11, 1); /* #FE990B */
Expand Down Expand Up @@ -134,10 +135,6 @@ h6 {
color: var(--primary-color);
}

.secondary-text {
color: var(--secondary-color);
}

.gray-text {
color: var(--text-color-primary);
}
Expand All @@ -156,16 +153,6 @@ a.primary-text:hover {
text-decoration: underline;
}

a.secondary-text {
color: var(--secondary-color);
text-decoration: none;
}

a.secondary-text:hover {
color: var(--secondary-color-hover);
text-decoration: underline;
}

a.offwhite-text {
color: var(--text-color-offwhite);
text-decoration: none;
Expand Down Expand Up @@ -193,7 +180,7 @@ a.nav-secondary {
}

a.nav-secondary:hover {
opacity: 70%;
opacity: 0.7;
text-decoration: none;
}

Expand Down Expand Up @@ -358,25 +345,6 @@ ul.nav-secondary {
opacity: 0.3 !important;
}

.btn-minimal-secondary {
background-color: transparent;
border-color: transparent;
color: var(--secondary-color);
}

.btn-minimal-secondary:hover {
background-color: var(--secondary-color);
border-color: transparent;
color: var(--text-color-offwhite);
}

.btn-secondary.disabled,
.btn-secondary:disabled {
background-color: var(--secondary-color) !important;
border-color: var(--secondary-color) !important;
color: var(--text-color-offwhite) !important;
}

.btn-default {
background-color: rgba(158, 158, 158, 1);
border-color: rgba(158, 158, 158, 1);
Expand Down Expand Up @@ -901,7 +869,7 @@ body.view-transcriptions--asset-detail main {

background-color: rgba(250, 250, 250, 0.8);
border-top: 1pt solid var(--bg-darkest-gray);
transition: height 1s linear 0;
transition: height 1s linear 0s;
}

#instruction-window.collapse {
Expand Down Expand Up @@ -984,37 +952,37 @@ div.related-links {

.alert.alert-primary {
background-color: var(--primary-color);
border-color: none;
border-color: var(--primary-color);
color: var(--text-color-offwhite);
}

.alert.alert-secondary {
background-color: var(--secondary-color);
border-color: none;
border-color: var(--secondary-color);
color: var(--text-color-primary);
}

.alert.alert-success {
background-color: var(--color-success);
border-color: none;
border-color: var(--color-success);
color: var(--text-color-offwhite);
}

.alert.alert-danger {
background-color: var(--color-danger);
border-color: none;
border-color: var(--color-danger);
color: var(--text-color-offwhite);
}

.alert.alert-warning {
background-color: var(--color-warning);
border-color: none;
border-color: var(--color-warning);
color: var(--text-color-primary);
}

.alert.alert-info {
background-color: var(--color-info);
border-color: none;
border-color: var(--color-info);
color: var(--text-color-primary);
}

Expand Down

0 comments on commit cc2b8ec

Please sign in to comment.