Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Simple social, private page list and black studio
Browse files Browse the repository at this point in the history
- #87 Resolving the conflict between simple social and glyphicons
- #81 Styling for private page lists
- #79 Resolving missing list styles from the Black Studio Visual Editor
  • Loading branch information
briandunnigan authored and briandunnigan committed Jan 12, 2015
1 parent 05f1a3b commit 523880c
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 9 deletions.
13 changes: 12 additions & 1 deletion sass/content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,15 @@ code {
.comment-form-email,
.comment-form-url {
width: 50%;
}
}

/*--------------------------------------------------------------
10.4 Private Page List
--------------------------------------------------------------*/

#page-private-list {
li {
list-style-type: none;
padding-bottom:10px;
}
}
14 changes: 14 additions & 0 deletions sass/widgets.scss
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,16 @@
.textwidget {
margin:$widget-content-margin;
}
ul {
li {
list-style-type: disc;
}
}
ol {
li {
list-style-type:decimal;
}
}
}
&.simple-social-icons {
ul {
Expand All @@ -138,6 +148,10 @@
margin:.5em!important;
}
}
.social-bloglovin:before, .social-dribbble:before, .social-email:before, .social-facebook:before, .social-flickr:before, .social-github:before, .social-gplus:before, .social-instagram:before, .social-linkedin:before, .social-pinterest:before, .social-rss:before, .social-stumbleupon:before, .social-tumblr:before, .social-twitter:before, .social-vimeo:before, .social-youtube:before {
display:none;
content:none;
}
}
&.widget_rcpt {
ul {
Expand Down
28 changes: 20 additions & 8 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,6 @@ th {
src: url("../../global/bootstrap-sass-master/assets/fonts/bootstrap/glyphicons-halflings-regular.eot");
src: url("../../global/bootstrap-sass-master/assets/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../../global/bootstrap-sass-master/assets/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"), url("../../global/bootstrap-sass-master/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../../global/bootstrap-sass-master/assets/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg");
}

.glyphicon {
position: relative;
top: 1px;
Expand Down Expand Up @@ -1146,7 +1145,7 @@ th {

html {
font-size: 10px;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-webkit-tap-highlight-color: transparent;
}

body {
Expand Down Expand Up @@ -5136,7 +5135,6 @@ a.thumbnail.active {
background-position: 0 0;
}
}

@keyframes progress-bar-stripes {
from {
background-position: 40px 0;
Expand All @@ -5146,7 +5144,6 @@ a.thumbnail.active {
background-position: 0 0;
}
}

.progress {
overflow: hidden;
height: 20px;
Expand Down Expand Up @@ -6356,7 +6353,7 @@ button.close {
border-radius: 10px;
cursor: pointer;
background-color: #000 \9;
background-color: rgba(0, 0, 0, 0);
background-color: transparent;
}
.carousel-indicators .active {
margin: 0;
Expand Down Expand Up @@ -6466,7 +6463,6 @@ button.close {
@-ms-viewport {
width: device-width;
}

.visible-xs, .visible-sm, .visible-md, .visible-lg {
display: none !important;
}
Expand Down Expand Up @@ -6725,15 +6721,13 @@ button.close {
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Proxima Nova';
src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot");
src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot?#iefix") format("embedded-opentype"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.svg#proxima_nova_ltsemibold") format("svg"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.woff") format("woff"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.ttf") format("truetype");
font-weight: 500;
font-style: normal;
}

/* - - - - - - - - - - - - - - - - - - -
== Titlebar
- - - - - - - - - - - - - - - - - - - */
Expand Down Expand Up @@ -7172,6 +7166,14 @@ code {
width: 50%;
}

/*--------------------------------------------------------------
10.4 Private Page List
--------------------------------------------------------------*/
#page-private-list li {
list-style-type: none;
padding-bottom: 10px;
}

/* - - - - - - - - - - - - - - - - - - -
== Captions
- - - - - - - - - - - - - - - - - - - */
Expand Down Expand Up @@ -7392,12 +7394,22 @@ object {
.widget.widget_black_studio_tinymce .textwidget {
margin: 1em;
}
.widget.widget_black_studio_tinymce ul li {
list-style-type: disc;
}
.widget.widget_black_studio_tinymce ol li {
list-style-type: decimal;
}
.widget.simple-social-icons ul {
margin: 0.5em !important;
}
.widget.simple-social-icons ul li {
margin: 0.5em !important;
}
.widget.simple-social-icons .social-bloglovin:before, .widget.simple-social-icons .social-dribbble:before, .widget.simple-social-icons .social-email:before, .widget.simple-social-icons .social-facebook:before, .widget.simple-social-icons .social-flickr:before, .widget.simple-social-icons .social-github:before, .widget.simple-social-icons .social-gplus:before, .widget.simple-social-icons .social-instagram:before, .widget.simple-social-icons .social-linkedin:before, .widget.simple-social-icons .social-pinterest:before, .widget.simple-social-icons .social-rss:before, .widget.simple-social-icons .social-stumbleupon:before, .widget.simple-social-icons .social-tumblr:before, .widget.simple-social-icons .social-twitter:before, .widget.simple-social-icons .social-vimeo:before, .widget.simple-social-icons .social-youtube:before {
display: none;
content: none;
}
.widget.widget_rcpt ul {
margin: 0;
}
Expand Down

0 comments on commit 523880c

Please sign in to comment.