Skip to content
This repository has been archived by the owner on Sep 5, 2019. It is now read-only.

Revert "update button mixin and styles to match" #54

Merged
merged 1 commit into from
Oct 12, 2015
Merged

Revert "update button mixin and styles to match" #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>Intelly Blog</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://fonts.googleapis.com/css?family=Roboto+Slab:400,300,700|Ubuntu:300,400,700,500' rel='stylesheet' type='text/css">
<link href="https://fonts.googleapis.com/css?family=Roboto:100,400,500,700|Ubuntu:300,400,700,500' rel='stylesheet' type='text/css">
<link rel="stylesheet" href="css/main.css">
</head>
<body>
Expand All @@ -33,21 +33,22 @@ <h2>Blog</h2>
<li><a href="">Home</a></li>
<li><a href="">Blog</a></li>
</ul>
<ul class="list_blog_socialmedia">
<li>Share</li>
<li><a href="www.twitter.com" class="icon-twitter"></a></li>
<li><a href="www.facebook.com" class="icon-facebook"></a></li>
<li><a href="www.google.com" class="icon-google"></a></li>
<li><a href="www.pinterest.com" class="icon-pinterest"></a></li>
<ul class="list_blog_socialmedia">Share
<li><a href="" class="icon-twitter"></a></li>
<li><a href="" class="icon-facebook"></a></li>
<li><a href="" class="icon-google"></a></li>
<li><a href="" class="icon-pinterest"></a></li>
</ul>
</nav>

<main ng-view></main>

<div class="add-blog_container">
<a href="#/blogs/new" class="add-blog">Add a new blog</a>
</div>

<section>
<a href=""></a>
<ul></ul>
<a href=""></a>
</section>
<section class="section_learnmore">
<h2>Serene in their assurance of their empire over matter</h2>
<p>No one would have believed in the last years of the nine-teenth century that this world was being watched keenly and closely by intelligences great than man's</p>
Expand Down
7 changes: 3 additions & 4 deletions src/app/blogs/blogs_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ <h2 ng-if="!vm.blogs.length">No blog posts yet!</h2>
<li>Date: {{blog.date | date:'shortDate'}}</li>
<li>Comments: {{blog.comments}}</li>
</ul>
<div class="blog_info_links">
<a href="#/blogs/{{blog._id}}" class="read_more">Read More</a>
<button ng-click="vm.delete(blog)" class="delete_blog">delete this blog</button>
</div>
<a href="#/blogs/{{blog._id}}" class="read_more">Read More</a>
<button ng-click="vm.delete(blog)">delete this blog</button>
</div>
</div>
</article>
<a href="#/blogs/new" class="add-blog">Add a new blog</a>
</div>
21 changes: 11 additions & 10 deletions src/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>Intelly Blog</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://fonts.googleapis.com/css?family=Roboto+Slab:400,300,700|Ubuntu:300,400,700,500' rel='stylesheet' type='text/css">
<link href="https://fonts.googleapis.com/css?family=Roboto:100,400,500,700|Ubuntu:300,400,700,500' rel='stylesheet' type='text/css">
<link rel="stylesheet" href="css/main.css">
</head>
<body>
Expand All @@ -33,21 +33,22 @@ <h2>Blog</h2>
<li><a href="">Home</a></li>
<li><a href="">Blog</a></li>
</ul>
<ul class="list_blog_socialmedia">
<li>Share</li>
<li><a href="www.twitter.com" class="icon-twitter"></a></li>
<li><a href="www.facebook.com" class="icon-facebook"></a></li>
<li><a href="www.google.com" class="icon-google"></a></li>
<li><a href="www.pinterest.com" class="icon-pinterest"></a></li>
<ul class="list_blog_socialmedia">Share
<li><a href="" class="icon-twitter"></a></li>
<li><a href="" class="icon-facebook"></a></li>
<li><a href="" class="icon-google"></a></li>
<li><a href="" class="icon-pinterest"></a></li>
</ul>
</nav>

<main ng-view></main>

<div class="add-blog_container">
<a href="#/blogs/new" class="add-blog">Add a new blog</a>
</div>

<section>
<a href=""></a>
<ul></ul>
<a href=""></a>
</section>
<section class="section_learnmore">
<h2>Serene in their assurance of their empire over matter</h2>
<p>No one would have believed in the last years of the nine-teenth century that this world was being watched keenly and closely by intelligences great than man's</p>
Expand Down
1 change: 1 addition & 0 deletions src/sass/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

// modules
@import "modules/reset";
@import "modules/globals";
@import "modules/colors";
@import "modules/typography";
@import "modules/mixins/flexbox";
Expand Down
4 changes: 4 additions & 0 deletions src/sass/modules/_globals.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

// body {
// padding: 0 5em;
// }
4 changes: 2 additions & 2 deletions src/sass/modules/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

//---font variable---//

$font-main: 'Roboto Slab', serif;
$font-sub: 'Ubuntu', sans-serif;
$font-main: Roboto, sans-serif;
$font-sub: Ubuntu, sans-serif;

13 changes: 6 additions & 7 deletions src/sass/modules/mixins/_button-mock.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@mixin button-mock ($button-bk: inherit, $button-clr: #fff, $hover-clr: #000, $hover-bk: $color-3) {
@mixin button-mock ($button-bk: inherit, $button-clr: #fff) {
text-decoration: none;
text-transform: uppercase;
color: $button-clr;
Expand All @@ -8,10 +8,9 @@
letter-spacing: .1em;
margin: auto 1em;
background-color: $button-bk;
font-family: $font-main;
&:hover {
background-color: $hover-bk;
color: $hover-clr;
border-color: $color-3;
}
&:hover {
background-color: $color-3;
color: #000;
border-color: $color-3;
}
}
49 changes: 22 additions & 27 deletions src/sass/partials/_blog_post.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,17 @@
.full-post {
padding-bottom: 2em;
}
button {
@include button-mock ($color-1);
float: right;
}
@media screen and (max-width: 50em) {
min-width: 20em;
}
&:after {
content: '';
width: 48em;
display: block;
height: 3em;
border-bottom: 1px solid $color-2;
padding-top: 2em;
}
}

.blog_info {

padding-top: 2em;
padding-bottom: 2em;
ul {
Expand All @@ -46,7 +43,6 @@
font-style: italic;
list-style-type: none;
padding-top: 0.5em;
padding-bottom: 1em;
font-size: 0.8em;
:nth-child(2):before {
content: '\b7\a0';
Expand All @@ -58,24 +54,23 @@
display: inline;
}
}
}

.read_more {
@include button-mock(#000, #fff, #fff, $color-3);
display: inline-block;
float: right;
font-size: 0.75em;
padding: 1em 3.03em;
&:hover {
color: #000;
}
}
.delete_blog {
@include button-mock(#000, #fff, #fff, $color-3);
font-size: 0.75em;
padding: 0.917em 1em;
&:hover {
color: #000;
.read_more {
text-decoration: none;
text-transform: uppercase;
color: #fff;
padding: .9em 3em;
border: 1px solid;
border-radius: .5em;
font-size: .8em;
letter-spacing: .1em;
background-color: #000;
display: inline-block;
float: right;
&:hover {
background-color: $color-3;
color: #000;
border-color: $color-3;
}
}
}

Expand Down
33 changes: 7 additions & 26 deletions src/sass/partials/_blogs_list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,15 @@
padding-bottom: 2em;
}

.read-more {
@extend .add-blog;
}

.blog_info_links {
float: right;
button {
margin: 0 auto;
}
a {
margin: 0 auto;
}
.add-blog {
@include button-mock($color-1, #fff);
font-size: 0.7em;
}

.add-blog_container {
width: 100%;
height: 4em;
text-align: center;
.read-more {
@extend .add-blog;
}

.add-blog {
@include button-mock(#fff, #000, #fff, #000);
font-size: 0.7em;
margin: 0 auto;
border: 1px solid $color-2;
padding: 1.5em 4em;
&:hover {
border-color: #000;
}

.blog_info_container {
@include flexbox;
}
3 changes: 1 addition & 2 deletions src/sass/partials/_section_bloghead.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
.section_bloghead {
background-color: $color-3;
padding: 3em 10em;
font-family: $font-main;
@media screen and (max-width: 50em) {
padding: 3em 2em;
margin: 0 auto;
}
h2 {
font-family: $font-main;
font-size: 2em;
font-family: $font-sub;
padding-bottom: 0.6em;
}
p {
Expand Down