Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Borderliner committed Nov 7, 2016
2 parents 1dc5dca + 3392109 commit 7c5ba73
Show file tree
Hide file tree
Showing 29 changed files with 382 additions and 87 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Meshki v1.3.3
* Meshki v1.4.0
* Copyright 2016, Mohammad reza Hajianpour <[email protected]>
* http://meshki.borderliner.ir/
* Free to use under the MIT license.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
[![Twitter Follow](https://img.shields.io/twitter/follow/meshki_ui.svg?style=social&label=Follow&maxAge=2592000?style=flat-square)](https://twitter.com/Meshki_UI)

Meshki is a simple, black-colored, responsive boilerplate to kickstart any responsive project.<br>
It is only <b>~16 KiB</b> (minified) and ~40 KiB (normal), including both CSS and JS files.<br>
It is only <b>~18 KiB</b> (minified) and ~41 KiB (normal), including both CSS and JS files.<br>
Check out <http://meshki.borderliner.ir/> for samples and details.

## Getting Started

There are a couple ways to download Meshki:
- [Download the zip](https://github.com/Borderliner/Meshki/archive/v1.3.3.zip) or [the tar.gz](https://github.com/Borderliner/Meshki/archive/v1.3.3.tar.gz)
- [Download the zip](https://github.com/Borderliner/Meshki/archive/v1.4.0.zip) or [the tar.gz](https://github.com/Borderliner/Meshki/archive/v1.4.0.tar.gz)
- Clone the repo: `git clone https://github.com/Borderliner/Meshki.git` (Note: this is under active development, so if you're looking for stable and safe, use the zipped download)
- Use Bower: `bower install meshki` **(Recommended)**
- Use npm: `npm install meshki`
Expand Down
7 changes: 7 additions & 0 deletions ROADMAP.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## v1.4.0
- [x] Fix navbar bottom padding overlaying the content
- [x] Better sidenav color, without borders
- [x] More compact footer
- [x] Add slider component
- [x] Add fieldset component

## v1.3.3
- [x] Fix grid offset which is caused after changing the whole system
- [x] Update grid system docs
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Meshki v1.3.3
# Meshki v1.4.0
# Copyright 2016, Mohammad reza Hajianpour <[email protected]>
# http://meshki.borderliner.ir/
# Free to use under the MIT license.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "meshki",
"version": "1.3.3",
"version": "1.4.0",
"homepage": "http://meshki.borderliner.ir/",
"repository": {
"type": "git",
Expand Down
5 changes: 2 additions & 3 deletions dist/meshki-rtl.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Meshki v1.3.3
* Meshki v1.4.0
* Copyright 2016, Mohammad reza Hajianpour <[email protected]>
* http://meshki.borderliner.ir/
* Free to use under the MIT license.
Expand Down Expand Up @@ -175,8 +175,7 @@ input[type=checkbox]+label.checkbox:before, input[type=radio]+label.radio:before
/* Sidenav starts from the right */
.sidenav {
left: auto;
right: -1px;
border-left: 1px solid #818181;
right: 0px;
}

/* Different padding of RTL Sidenav */
Expand Down
2 changes: 1 addition & 1 deletion dist/meshki-rtl.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

155 changes: 128 additions & 27 deletions dist/meshki.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Meshki v1.3.3
* Meshki v1.4.0
* Copyright 2016, Mohammad reza Hajianpour <[email protected]>
* http://meshki.borderliner.ir/
* Free to use under the MIT license.
Expand Down Expand Up @@ -39,6 +39,8 @@ input[type="button"] {
color: #E1E1E1;
border: 2px solid #E1E1E1;
line-height: normal !important; /* Fix Midori bug */
/* Button expands out of boundary bug */
max-width: 98%;
}

a.button.small,
Expand Down Expand Up @@ -261,7 +263,7 @@ input[type="button"].warning:active {
}
}
/*
* Meshki v1.3.3
* Meshki v1.4.0
* Copyright 2016, Mohammad reza Hajianpour <[email protected]>
* http://meshki.borderliner.ir/
* Free to use under the MIT license.
Expand Down Expand Up @@ -317,7 +319,7 @@ pre.filled > code {
color: #000;
}
/*
* Meshki v1.3.3
* Meshki v1.4.0
* Copyright 2016, Mohammad reza Hajianpour <[email protected]>
* http://meshki.borderliner.ir/
* Free to use under the MIT license.
Expand All @@ -333,20 +335,13 @@ footer, .footer {
background-color: #111;
border-top: 2px solid #E1E1E1;
margin: 25px 0 0 0;
padding: 25px 50px;
padding: 25px 50px 0 50px;
text-align: center;
}

/* Remove bottom padding in compact mode */
footer.compact, .footer.compact {
padding-bottom: 0px;
}

/* Remove bottom margins of columns in compact mode */
footer.compact .column,
.footer.compact .column,
footer.compact .columns,
.footer.compact .columns {
/* Remove bottom margins of columns */
footer .col,
.footer .col {
margin-bottom: 0px;
}

Expand All @@ -363,7 +358,7 @@ footer .row,
}
}
/*
* Meshki v1.3.3
* Meshki v1.4.0
* Copyright 2016, Mohammad reza Hajianpour <[email protected]>
* http://meshki.borderliner.ir/
* Free to use under the MIT license.
Expand Down Expand Up @@ -468,8 +463,10 @@ legend {

/* Fieldset normalization */
fieldset {
border-width: 0;
padding: 0;
border: 2px solid #E1E1E1 !important;
border-radius: 5px;
padding: 20px !important;
margin: 10px 5px !important;
}

/* Checkbox and Radio normalization */
Expand Down Expand Up @@ -538,8 +535,108 @@ input[type="radio"]:checked + label.radio:before {
input[type="checkbox"]:focus + label.checkbox, input[type="radio"]:focus + label.radio {
outline: none !important;
}

/* Style input range */
input[type=range] {
-webkit-appearance: none;
margin: 0 5px;
background-color: transparent;
}

input[type=range]:focus {
outline: none;
}

input[type=range]::-webkit-slider-runnable-track {
width: 100%;
height: 26px;
cursor: pointer;
background: #222;
border-radius: 25px;
border: 2px solid #E1E1E1;
}

input[type=range]::-webkit-slider-thumb {
height: 20px;
width: 20px;
border-radius: 25px;
background-color: #E1E1E1;
cursor: pointer;
-webkit-appearance: none;
margin-top: 1px;
border: 2px solid transparent;
transition: background-color .3s, border-color .3s;
}

input[type=range]:focus::-webkit-slider-thumb,
input[type=range]:hover::-webkit-slider-thumb {
background-color: #55acee;
border-color: #E1E1E1;
}

input[type=range]::-moz-range-track {
width: 100%;
height: 23px;
cursor: pointer;
background-color: #222;
border-radius: 25px;
border: 2px solid #E1E1E1;
}

input[type=range]::-moz-range-thumb {
height: 17px;
width: 17px;
border-radius: 25px;
background-color: #E1E1E1;
border: 2px solid transparent;
cursor: pointer;
transition: background-color .3s, border-color .3s;
}

input[type=range]:focus::-moz-range-thumb,
input[type=range]:hover::-moz-range-thumb {
background-color: #55acee;
border-color: #E1E1E1;
}

/* Fix Firefox outline bug */
input[type=range]::-moz-focus-outer {
border: 0;
}

input[type=range]::-ms-track {
width: 100%;
height: 26px;
cursor: pointer;
background-color: transparent;
border-color: transparent;
color: transparent;
}

input[type=range]::-ms-fill-lower,
input[type=range]::-ms-fill-upper {
background-color: #222;
border: 2px solid #E1E1E1;
border-radius: 50px;
}

input[type=range]::-ms-thumb {
height: 20px;
width: 20px;
border-radius: 25px;
background-color: #E1E1E1;
cursor: pointer;
border: 2px solid transparent;
transition: background-color .3s, border-color .3s;
}

input[type=range]:focus::-ms-thumb,
input[type=range]:hover::-ms-thumb {
background-color: #55acee;
border-color: #E1E1E1;
}
/*
* Meshki v1.3.3
* Meshki v1.4.0
* Copyright 2016, Mohammad reza Hajianpour <[email protected]>
* http://meshki.borderliner.ir/
* Free to use under the MIT license.
Expand Down Expand Up @@ -641,7 +738,7 @@ input[type="checkbox"]:focus + label.checkbox, input[type="radio"]:focus + label
.offset-by-one-half.col { margin-left: 52%; }
}
/*
* Meshki v1.3.3
* Meshki v1.4.0
* Copyright 2016, Mohammad reza Hajianpour <[email protected]>
* http://meshki.borderliner.ir/
* Free to use under the MIT license.
Expand Down Expand Up @@ -675,7 +772,7 @@ li {
margin-bottom: 1rem;
}
/*
* Meshki v1.3.3
* Meshki v1.4.0
* Copyright 2016, Mohammad reza Hajianpour <[email protected]>
* http://meshki.borderliner.ir/
* Free to use under the MIT license.
Expand Down Expand Up @@ -865,7 +962,7 @@ compatibility reasons.
/* Larger than Desktop HD */
@media (min-width: 1200px) {}
/*
* Meshki v1.3.3
* Meshki v1.4.0
* Copyright 2016, Mohammad reza Hajianpour <[email protected]>
* http://meshki.borderliner.ir/
* Free to use under the MIT license.
Expand All @@ -876,6 +973,11 @@ compatibility reasons.
–––––––––––––––––––––––––––––––––––––––––––––––––– */

/* General attributes */

nav, .nav {
height: 0;
}

nav ul,
.nav ul {
width: 100%;
Expand Down Expand Up @@ -1478,7 +1580,7 @@ template {
display: none;
}
/*
* Meshki v1.3.3
* Meshki v1.4.0
* Copyright 2016, Mohammad reza Hajianpour <[email protected]>
* http://meshki.borderliner.ir/
* Free to use under the MIT license.
Expand All @@ -1496,9 +1598,8 @@ template {
z-index: 10; /* Stays on top of everything, unless a modal is implemented */
top: 0;
left: -1px;
background-color: #111;
background-color: #000;
padding-top: 15px;
border-right: 1px solid #818181;
overflow-x: hidden;
transition: 0.5s;
}
Expand Down Expand Up @@ -1577,7 +1678,7 @@ template {
}
}
/*
* Meshki v1.3.3
* Meshki v1.4.0
* Copyright 2016, Mohammad reza Hajianpour <[email protected]>
* http://meshki.borderliner.ir/
* Free to use under the MIT license.
Expand Down Expand Up @@ -1632,7 +1733,7 @@ table.hover > tbody tr:hover {
background-color: #404040;
}
/*
* Meshki v1.3.3
* Meshki v1.4.0
* Copyright 2016, Mohammad reza Hajianpour <[email protected]>
* http://meshki.borderliner.ir/
* Free to use under the MIT license.
Expand Down Expand Up @@ -1669,7 +1770,7 @@ p {
margin-top: 0;
}
/*
* Meshki v1.3.3
* Meshki v1.4.0
* Copyright 2016, Mohammad reza Hajianpour <[email protected]>
* http://meshki.borderliner.ir/
* Free to use under the MIT license.
Expand Down
2 changes: 1 addition & 1 deletion dist/meshki.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Meshki v1.3.3
* Meshki v1.4.0
* Copyright 2016, Mohammad reza Hajianpour <[email protected]>
* http://meshki.borderliner.ir/
* Free to use under the MIT license.
Expand Down
2 changes: 1 addition & 1 deletion dist/meshki.min.css

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions docs/custom-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ a {
}

.custom-down-cdn {
width: 100%;
max-width: 250px;
width: 250px;
}

.custom-down-cdn span {
Expand Down
3 changes: 1 addition & 2 deletions docs/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ a {
}

.custom-down-cdn {
width: 100%;
max-width: 250px;
width: 250px;
}

#twitter-widget-0 {
Expand Down
Loading

0 comments on commit 7c5ba73

Please sign in to comment.