mirror of
https://github.com/Poniverse/Pony.fm.git
synced 2025-02-17 02:24:22 +01:00
Dropdown and font updates
This commit is contained in:
parent
4b552a8358
commit
2ab4d8f7b8
6 changed files with 31 additions and 14 deletions
1
resources/assets/styles/app.less
vendored
1
resources/assets/styles/app.less
vendored
|
@ -16,6 +16,7 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
@import 'https://fonts.googleapis.com/css?family=Roboto:400,400i,700';
|
||||
@import 'base/bootstrap/bootstrap';
|
||||
@import 'base/font-awesome/font-awesome';
|
||||
@import 'variables';
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
//
|
||||
//## Font, line-height, and color for body text, headings, and more.
|
||||
|
||||
@font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
@font-family-sans-serif: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
@font-family-serif: Georgia, "Times New Roman", Times, serif;
|
||||
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
|
||||
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
|
||||
|
|
|
@ -41,6 +41,7 @@
|
|||
> .btn {
|
||||
float: left;
|
||||
display: block;
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
> .btn + .btn {
|
||||
|
@ -54,6 +55,11 @@
|
|||
> .btn {
|
||||
background: @pfm-purple;
|
||||
color: #fff;
|
||||
border-radius: 0 15px 15px 0;
|
||||
}
|
||||
|
||||
> .dropdown-toggle {
|
||||
border-radius: 15px 0 0 15px;
|
||||
}
|
||||
|
||||
> .btn + .btn {
|
||||
|
@ -70,13 +76,18 @@
|
|||
> .btn {
|
||||
background: @pfm-purple;
|
||||
color: #fff;
|
||||
border-radius: 0 15px 15px 0;
|
||||
}
|
||||
|
||||
> .dropdown-toggle {
|
||||
border-radius: 15px 0 0 15px;
|
||||
}
|
||||
|
||||
.dropdown-menu {
|
||||
.box-shadow(none);
|
||||
|
||||
.material-shadow(2);
|
||||
margin: 0px;
|
||||
border: 2px solid @pfm-purple;
|
||||
border: 0;
|
||||
border-radius: 2px;
|
||||
|
||||
li.selected {
|
||||
a {
|
||||
|
@ -96,7 +107,7 @@
|
|||
|
||||
> .btn {
|
||||
border: none;
|
||||
background: #eee;
|
||||
background: #e0e0e0;
|
||||
font-size: 8pt;
|
||||
padding: 5px 7px;
|
||||
text-shadow: none;
|
||||
|
@ -247,21 +258,21 @@ html .dropdown-menu {
|
|||
margin: 0px;
|
||||
|
||||
> a {
|
||||
padding: 6px 10px;
|
||||
font-size: 8pt;
|
||||
padding: 8px 10px;
|
||||
font-size: 10pt;
|
||||
}
|
||||
|
||||
> .dont-close {
|
||||
float: right;
|
||||
display: block;
|
||||
width: 24px;
|
||||
width: 30px;
|
||||
text-align: center;
|
||||
padding: 3px 3px;
|
||||
padding: 8px 6px;
|
||||
font-size: 10pt;
|
||||
}
|
||||
|
||||
> .dont-close + a {
|
||||
margin-right: 24px;
|
||||
margin-right: 30px;
|
||||
clear: none;
|
||||
}
|
||||
|
||||
|
|
2
resources/assets/styles/content.less
vendored
2
resources/assets/styles/content.less
vendored
|
@ -68,7 +68,7 @@
|
|||
.box-sizing(border-box);
|
||||
float: left;
|
||||
width: 25%;
|
||||
padding: 5px;
|
||||
padding: 0px;
|
||||
line-height: normal;
|
||||
.material-shadow(1);
|
||||
border-radius: 2px;
|
||||
|
|
5
resources/assets/styles/layout.less
vendored
5
resources/assets/styles/layout.less
vendored
|
@ -23,7 +23,7 @@
|
|||
html body {
|
||||
height: 100%;
|
||||
background: #fff;
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
|
||||
font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
|
||||
padding: 0px !important;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
|
@ -200,8 +200,7 @@ header {
|
|||
|
||||
> a {
|
||||
display: block;
|
||||
padding: 10px 25px;
|
||||
padding-right: 0px;
|
||||
padding: 12px 0 12px 22px;
|
||||
overflow: hidden;
|
||||
color: fadeout(#fff, 20%);
|
||||
|
||||
|
|
6
resources/assets/styles/mixins.less
vendored
6
resources/assets/styles/mixins.less
vendored
|
@ -142,3 +142,9 @@
|
|||
.light-material-shadow(@size) when (@size = 2) {
|
||||
box-shadow: 0 3px 6px rgba(0, 0, 0, .08), 0 3px 6px rgba(0, 0, 0, .12);
|
||||
}
|
||||
|
||||
.img-thumbnail() {
|
||||
border: 0 !important;
|
||||
padding: 0 !important;
|
||||
.material-shadow(2);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue