github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-31 22:16:32 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Tweak some styles

Browse Source 
- Rename btn-blend to btn-naked
- Tweak input focus style
- Other stuff
This commit is contained in:
Toby Zerner 2015-01-30 12:17:55 +10:30
parent 3649de2ccb
commit befb3d1929
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/ember/app/styles/bootstrap/variables.less
View File

@ -13,7 +13,7 @@
@btn-default-color: @fl-body-control-color;
@input-bg: @fl-body-control-bg;
@input-border-focus: darken(@fl-body-control-bg, 5%);
@input-border: @fl-body-control-bg;
@input-border-focus: @fl-body-control-bg;
@input-color: @fl-body-control-color;
@input-color-placeholder: @fl-body-control-color;

9
framework/core/ember/app/styles/flarum/components.less
View File

@ -65,13 +65,17 @@
}
// Buttons that blend into the background
.btn-blend {
.btn-naked {
background: transparent;
&:hover {
background: @fl-body-control-bg;
}
}
.btn-rounded {
border-radius: 18px;
}
// ------------------------------------
// Form Controls
@ -79,7 +83,8 @@
.box-shadow(none);
&:focus,
&.focus {
background-color: @input-border-focus;
background-color: #fff;
color: @fl-body-color;
.box-shadow(none);
}
}

8
framework/core/ember/app/styles/flarum/discussion.less
View File

@ -108,10 +108,10 @@
}
}
.item.highlight .post {
border: 10px solid rgba(255, 255, 0, 0.2);
border-radius: 10px;
border: 8px solid rgba(255, 255, 0, 0.2);
border-radius: 8px;
padding: 15px 15px 0 105px;
margin: -25px -25px -10px -25px;
margin: -23px -23px -8px -23px;
}
.post-header {
@ -140,7 +140,7 @@
}
}
.post-body {
font-size: 15px;
font-size: 14px;
line-height: 1.6;
padding-bottom: 1px;
}

2
framework/core/ember/app/templates/components/discussions/discussion-listing.hbs
View File

@ -1,7 +1,7 @@
{{ui/controls/dropdown-button
items=controls
class="contextual-controls"
buttonClass="btn btn-default btn-icon btn-sm btn-blend"
buttonClass="btn btn-default btn-icon btn-sm btn-naked"
buttonClick="populateControls"
menuClass="pull-right"}}

2
framework/core/ember/app/templates/components/discussions/post-wrapper.hbs
View File

@ -1,7 +1,7 @@
{{ui/controls/dropdown-button
items=controls
class="contextual-controls"
buttonClass="btn btn-default btn-icon btn-sm btn-blend"
buttonClass="btn btn-default btn-icon btn-sm btn-naked"
buttonClick="populateControls"
menuClass="pull-right"}}