Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Commit

Permalink
Fixed issues with build and style errors.
Browse files Browse the repository at this point in the history
Fixes #798
Closes #714
Closes #714
  • Loading branch information
jkleinsc committed Nov 11, 2016
1 parent fb96048 commit e325205
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
],
"rules":{
"sh-waqar/declaration-use-variable": "color",
"scss/at-import-no-partial-extension": true,
"scss/at-import-partial-extension-whitelist": [''],
"scss/at-import-no-partial-leading-underscore": true,
"scss/at-extend-no-missing-placeholder": true,
"declaration-bang-space-after": "never",
Expand Down
1 change: 0 additions & 1 deletion app/styles/_print.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,4 @@
.patient-history-heading {
border-bottom: 1px solid $black;
}

}
2 changes: 1 addition & 1 deletion app/styles/components/_buttons.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Loading icon from http://www.bootply.com/128062
.glyphicon-refresh-animate {
-webkit-animation: spin2 .7s infinite linear;
-animation: spin .7s infinite linear;
animation: spin .7s infinite linear;
}

@-webkit-keyframes spin2 {
Expand Down
1 change: 0 additions & 1 deletion app/styles/components/_panel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
color: $white;
}
}

}

.nav-pills {
Expand Down
6 changes: 6 additions & 0 deletions app/styles/components/_sidebar_nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

.sidebar-nav-logo {
@include transition_opacity;

display: inline-block;
padding: 0 15px;
height: 55px;
Expand Down Expand Up @@ -129,6 +130,7 @@

.btn {
@include transition(opacity);

position: absolute;
top: 10px;
right: 15px;
Expand Down Expand Up @@ -159,6 +161,7 @@
// main section link
.primary-section-link {
@include transition_all;

display: block;
border-bottom: 1px solid $navy_drkest;
background: $navy_mid2;
Expand All @@ -170,6 +173,7 @@

.mega-octicon {
@include transition_all;

float: left;
margin-right: 12px;
width: 16px;
Expand All @@ -191,6 +195,7 @@

.category-sub-item {
@include transition_all;

display: block;
background: $navy_mid3;
padding: 0 15px;
Expand All @@ -212,6 +217,7 @@

.octicon {
@include transition_all;

float: left;
margin-right: 6px;
margin-left: 6px;
Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"ember-cli-release": "^0.2.9",
"ember-cli-sass": "^5.2.1",
"ember-cli-sri": "^2.1.0",
"ember-cli-stylelint": "^0.6.2",
"ember-cli-stylelint": "0.6.3",
"ember-cli-template-lint": "0.4.12",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
Expand All @@ -82,9 +82,10 @@
"pouchdb-list": "^1.1.0",
"request": "2.76.0",
"stylelint": "7.5.0",
"stylelint-config-concentric": "1.0.5",
"stylelint-declaration-use-variable": "^1.4.0",
"stylelint-scss": "1.3.4"
"stylelint-config-concentric": "1.0.6",
"stylelint-declaration-use-variable": "1.6.0",
"stylelint-scss": "1.3.4",
"broccoli-stylelint": "billybonks/broccoli-stylelint"
},
"ember-addon": {
"paths": [
Expand Down

0 comments on commit e325205

Please sign in to comment.