Skip to content
This repository has been archived by the owner on Jun 28, 2021. It is now read-only.

feature/scss linting #403

Merged
merged 5 commits into from
Jul 24, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
"scripts": {
"test": "./node_modules/karma/bin/karma start",
"test:ci:unit": "./node_modules/karma/bin/karma start --browsers PhantomJS --single-run; npm run test:ci:lint",
"test:ci:functional": "node ./nightwatch.js -c ./nightwatch.json -e production",
"test:ci:lint": "eslint ./src/**/*.js",
"test:dev:unit": "./node_modules/karma/bin/karma start",
"test:ci:functional": "node ./nightwatch.js -c ./nightwatch.json -e production",
"test:dev:functional": "node ./nightwatch.js -c ./nightwatch.json",
"test:ci:lint": "eslint ./src/**/*.js",
"test:dev:lint": "eslint ./src/scripts/**/*.js",
"test:stylelint": "stylelint './src/**/*.scss' --config webpack/.stylelintrc",
"dev": "node webpack/dev-server.js & PORT=8000 node start.js",
"start": "NODE_PATH=\"./src\" node ./start",
"build": "node ./node_modules/webpack/bin/webpack.js --config webpack/prod.config.js",
Expand Down Expand Up @@ -139,6 +140,7 @@
"path": "^0.11.14",
"phantomjs-polyfill": "0.0.1",
"piping": "^0.3.0",
"pre-commit": "^1.1.3",
"react-addons-test-utils": "^0.14.7",
"react-transform-catch-errors": "^1.0.0",
"react-transform-hmr": "^1.0.1",
Expand All @@ -149,11 +151,11 @@
"selenium-server": "^2.48.2",
"sinon": "^1.15.3",
"sinon-chai": "^2.8.0",
"stylelint-webpack-plugin": "^0.2.0",
"webpack-dev-server": "^1.6.5"
},
"pre-commit": [
"lint",
"validate",
"test"
"test:dev:lint",
"test:stylelint"
]
}
2 changes: 1 addition & 1 deletion src/components/Ayah/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@

b{
float: right;
border-color:: transparent;
border-color: transparent;
border-width: 0px 0px 1px 0px;
border-style: solid;
&.active {
Expand Down
1 change: 0 additions & 1 deletion src/styles/fonts/_fonts.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600|Montserrat);
@font-face{
font-family: 'Montserrat';
src: url('./static/fonts/montserrat/Montserrat-Regular.otf');
Expand Down
34 changes: 0 additions & 34 deletions src/styles/main.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
//@import 'bootstrap';
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
//@import '~bootstrap-sass/assets/stylesheets/bootstrap';

@import 'mixins/center';
@import 'components/SurahNav';
Expand Down Expand Up @@ -44,38 +42,6 @@ a:hover{
display: none;
}
}
.right-side{
padding-top: 190px;
width: 83.33333333%;
float: right;
display: block;
position: relative;
background-color: #fff;
transition: width 0.5s;
min-height: 100vh;
z-index: 9999;

.navbar-brand{
display: none;
}

@media (max-width: $screen-sm-max) {
width: 100%;
padding-top: 150px;

.navbar-brand{
display: block;
}
}

&.active{
width: 99%;

.navbar{
width: 99; // This is almost like `noop` to get the css working
}
}
}
}

.form-control:focus{
Expand Down
1 change: 0 additions & 1 deletion src/styles/partials/_navbar-brand.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
}
img {
display: inline !important;
height: 100%;
&.logo{
height: 80%;
vertical-align: top;
Expand Down
7 changes: 7 additions & 0 deletions webpack/.stylelintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there are 100s of rules are available.

I will add them in separate commit with fixes around.

"rules": {
"unit-no-unknown": true,
"no-duplicate-selectors": true,
"block-no-empty": true
}
}