purpleraft/PurpleMine2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more plugin proof way of setting Font Awesome icons, fixes #1

Browse Source
This commit is contained in:
mrliptontea
2015-03-13 11:33:06 +01:00
parent ccc9108bfb
commit 160b457355
5 changed files with 201 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -59,6 +59,7 @@ Latest (master):
* Changesets will look similar to issue's journal
+ Improved revision page layout and added Font Awesome icons
+ Improved file content view
* Fixed #1: Font Awesome icons will no longer break plugins' icons
v1.2.0 (2015-03-03):

4
src/sass/components/_admin.scss
View File

@@ -15,7 +15,7 @@
a {
display: inline-block;
padding-left: 8 + 16px;
padding-left: 5px + 20px;
background-position: 0 center;
}
}
@@ -24,7 +24,7 @@
list-style-type: none;
> a {
padding-left: $sidebar-padding-horizontal + 8 + 16px;
padding-left: $sidebar-padding-horizontal + 5px + 20px;
background-repeat: no-repeat;
background-position: $sidebar-padding-horizontal center;
}

124
src/sass/components/_icons.scss
View File

@@ -64,6 +64,13 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
{
.icon {
@extend %fa-icon;
padding-left: 20px;
background-repeat: no-repeat;
background-position: 0% 50%;
&:before {
margin-left: -20px;
}
.contextual & {
margin-left: .5em;
@@ -268,21 +275,12 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
*/
@if $use-font-awesome
{
#admin-menu {
#admin-index > & {
a {
padding-left: 0;
}
}
li {
> a {
%admin-icon {
@extend %fa-icon;
padding-left: $sidebar-padding-horizontal;
&:before {
width: 1em;
margin-right: .5em;
width: 20px;
margin-left: -(5px + 20px);
color: $gray;
text-align: center;
}
@@ -295,21 +293,97 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
color: $gray-darkest;
}
}
#admin-menu {
#admin-index > & {
a {
padding-left: 5px + 20px;
}
}
.projects:before { content: $fa-var-cubes; }
.users:before { content: $fa-var-user; }
.groups:before { content: $fa-var-group; }
.roles:before { content: $fa-var-eye; }
.trackers:before { content: $fa-var-ticket; }
.issue_statuses:before { content: $fa-var-pencil-square; }
.workflows:before { content: $fa-var-sitemap; }
.custom_fields:before { content: $fa-var-edit; }
.enumerations:before { content: $fa-var-list; }
.settings:before { content: $fa-var-gear; }
.plugins:before { content: $fa-var-puzzle-piece; }
.info:before { content: $fa-var-info-circle; }
.server_authentication:before { content: $fa-var-key; }
li {
> a {
padding-left: $sidebar-padding-horizontal + 5px + 20px;
}
}
.projects {
@extend %admin-icon;
&:before { content: $fa-var-cubes; }
}
.users {
@extend %admin-icon;
&:before { content: $fa-var-user; }
}
.groups {
@extend %admin-icon;
&:before { content: $fa-var-group; }
}
.roles {
@extend %admin-icon;
&:before { content: $fa-var-eye; }
}
.trackers {
@extend %admin-icon;
&:before { content: $fa-var-ticket; }
}
.issue_statuses {
@extend %admin-icon;
&:before { content: $fa-var-pencil-square; }
}
.workflows {
@extend %admin-icon;
&:before { content: $fa-var-sitemap; }
}
.custom_fields {
@extend %admin-icon;
&:before { content: $fa-var-edit; }
}
.enumerations {
@extend %admin-icon;
&:before { content: $fa-var-list; }
}
.settings {
@extend %admin-icon;
&:before { content: $fa-var-gear; }
}
.plugins {
@extend %admin-icon;
&:before { content: $fa-var-puzzle-piece; }
}
.info {
@extend %admin-icon;
&:before { content: $fa-var-info-circle; }
}
.server_authentication {
@extend %admin-icon;
&:before { content: $fa-var-key; }
}
}
}
@else

110
src/sass/components/_jstoolbar.scss
View File

@@ -25,7 +25,7 @@
@if $use-font-awesome
{
.jstElements {
button[type="button"] {
%jstb-icon {
padding: 0;
background: $body-bg;
background-image: none;
@@ -37,21 +37,95 @@
}
}
.jstb_strong:before { content: $fa-var-bold; }
.jstb_em:before { content: $fa-var-italic; }
.jstb_ins:before { content: $fa-var-underline; }
.jstb_del:before { content: $fa-var-strikethrough; }
.jstb_code:before { content: $fa-var-code; }
.jstb_h1:before { content: $fa-var-header; }
.jstb_h2:before { content: $fa-var-header; font-size: 11px; }
.jstb_h3:before { content: $fa-var-header; font-size: 9px; }
.jstb_ul:before { content: $fa-var-list-ul; }
.jstb_ol:before { content: $fa-var-list-ol; }
.jstb_bq:before { content: $fa-var-indent; }
.jstb_unbq:before { content: $fa-var-outdent; }
.jstb_pre:before { content: $fa-var-terminal; }
.jstb_link:before { content: $fa-var-link; }
.jstb_img:before { content: $fa-var-image; }
.jstb_strong {
@extend %jstb-icon;
&:before { content: $fa-var-bold; }
}
.jstb_em {
@extend %jstb-icon;
&:before { content: $fa-var-italic; }
}
.jstb_ins {
@extend %jstb-icon;
&:before { content: $fa-var-underline; }
}
.jstb_del {
@extend %jstb-icon;
&:before { content: $fa-var-strikethrough; }
}
.jstb_code {
@extend %jstb-icon;
&:before { content: $fa-var-code; }
}
.jstb_h1 {
@extend %jstb-icon;
&:before { content: $fa-var-header; }
}
.jstb_h2 {
@extend %jstb-icon;
&:before { font-size: .7857em; content: $fa-var-header; }
}
.jstb_h3 {
@extend %jstb-icon;
&:before { font-size: .6429em; content: $fa-var-header; }
}
.jstb_ul {
@extend %jstb-icon;
&:before { content: $fa-var-list-ul; }
}
.jstb_ol {
@extend %jstb-icon;
&:before { content: $fa-var-list-ol; }
}
.jstb_bq {
@extend %jstb-icon;
&:before { content: $fa-var-indent; }
}
.jstb_unbq {
@extend %jstb-icon;
&:before { content: $fa-var-outdent; }
}
.jstb_pre {
@extend %jstb-icon;
&:before { content: $fa-var-terminal; }
}
.jstb_link {
@extend %jstb-icon;
&:before { content: $fa-var-link; }
}
.jstb_img {
@extend %jstb-icon;
&:before { content: $fa-var-image; }
}
button.jstb_help {
color: $link-color;
@@ -60,9 +134,7 @@
color: $link-hover-color;
}
&:before {
content: $fa-var-question-circle;
}
&:before { content: $fa-var-question-circle; }
}
}
}

4
stylesheets/application.css
View File

File diff suppressed because one or more lines are too long