Skip to content

Commit

Permalink
update version 2.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
bootflat committed Sep 3, 2014
1 parent f4d48a7 commit 3fa3773
Show file tree
Hide file tree
Showing 15 changed files with 439 additions and 23 deletions.
2 changes: 2 additions & 0 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ The source files are in the `bootflat/` folder. You can just grab the `bootflat/

## Changelog:

2014/8/26 version 2.0.4 `add widgets: TimeLine`

2014/8/26 add `color picker`, you can make a flat design with it

2014/7/9 version 2.0.3 `support bootstrap 3.2.0 and Sass 3.3.9, add wigets: Calendar, Pricing`
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ url: http://bootflat.github.io
encoding: UTF-8

# Custom vars
current_version: 2.0.3
current_version: 2.0.4
repo: https://github.com/bootflat/bootflat.github.io
159 changes: 157 additions & 2 deletions bootflat/css/bootflat.css

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

4 changes: 2 additions & 2 deletions bootflat/css/bootflat.css.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions bootflat/css/bootflat.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions bootflat/scss/bootflat.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@
"bootflat/panel",
"bootflat/accordion",
"bootflat/footer",
"bootflat/timeline",
"bootflat/dropdown";
189 changes: 189 additions & 0 deletions bootflat/scss/bootflat/_timeline.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
// Variables
//------------------------------------------------------
$timeline-division-background-color: $mediumgray-light !default;
$timeline-years-background-color: $mediumgray-dark !default;
$timeline-years-color: $white !default;
$timeline-dotted-color: $aqua-light !default;
$timeline-dotted-border-color: $lightgray-light !default;

$timeline-radius: 4px !default;

// Exports
//------------------------------------------------------

@include exports("timeline") {

/**
* timeline
* --------------------------------------------------
*/

.timeline {
& dl {
position: relative;
top: 0;
margin: 0;
padding: 20px 0;

&:before {
position: absolute;
top: 0;
bottom: 0;
left: 50%;
margin-left: -1px;
width: 2px;
content: '';
background-color: $timeline-division-background-color;
z-index: 100;
}

& dt {
position: relative;
top: 30px;
padding: 3px 5px;
margin: 0 auto 30px;
text-align: center;
@include radius($type: border-radius, $value: $timeline-radius);
background-color: $timeline-years-background-color;
font-weight: normal;
color: $timeline-years-color;
width: 120px;
z-index: 200;
}

& dd {
position: relative;
z-index: 200;
& .circ {
position: absolute;
top: 40px;
left: 50%;
margin-left: -11px;
border: 4px solid $timeline-dotted-border-color;
width: 22px;
height: 22px;
@include radius($type: border-radius, $value: 50%);
background-color: $timeline-dotted-color;
z-index: 200;
}

& .time {
position: absolute;
top: 31px;
left: 50%;
padding: 10px 20px;
width: 100px;
display: inline-block;
color: $timeline-dotted-color;
}

& .events {
position: relative;
margin-top: 31px;
padding: 10px 10px 0;
@include radius($type: border-radius, $value: $timeline-radius);
background-color: $white;
width: 47%;

&:before {
position: absolute;
top: 12px;
width: 0;
height: 0;
content: '';
border-width: 6px;
border-style: solid;
}

& .events-object {
margin-right: 10px;
}

& .events-body {
overflow: hidden;
zoom: 1;

& .events-heading {
margin: 0 0 10px;
font-size: 14px;
}
}
}

&.pos-right {

& .time {
margin-left: -100px;
text-align: right;
}
& .events {
float: right;

&:before {
left: -12px;
border-color: transparent $white transparent transparent;
}
}
}
&.pos-left {
& .time {
margin-left: 0;
text-align: left;
}
& .events {
float: left;
&:before {
right: -12px;
border-color: transparent transparent transparent $white;
}
}
}
}
}
}
@media screen and (max-width: 767px) {
.timeline dl {
&:before {
left: 60px;
}
& dt {
margin: 0 0 30px;
}
& dd {
& .circ {
left: 60px;
}
& .time {
left: 0;
}
&.pos-left {
& .time {
margin-left: 0;
padding: 10px 0;
text-align: left;
}
& .events {
float: right;
width: 84%;
&:before {
left: -12px;
border-color: transparent $white transparent transparent;
}
}
}
&.pos-right {
& .time {
margin-left: 0;
padding: 10px 0;
text-align: left;
}
& .events {
float: right;
width: 84%;
}
}
}
}
}

}
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Bootflat",
"version": "2.0.3",
"version": "2.0.4",
"homepage": "http://bootflat.github.io",
"authors": [
"flathemes <[email protected]>"
Expand Down
Loading

0 comments on commit 3fa3773

Please sign in to comment.