Beanz/flatpress
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I don't understand how people say git is easy. Thing seems to be messing up my commits.

Browse Source 
Signed-off-by: liquibyte <liquibyte@gmail.com>
This commit is contained in:
liquibyte 2014-01-29 23:00:41 -05:00
parent e121753594
commit c9bf4a8d26
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fp-interface/themes/leggero/flatmaas-rev/res/admin.css
View File

@ -485,13 +485,8 @@ li.admin-widgetset {
text-align: left; text-align: left;
} }
<<<<<<< HEAD
#widget-trashcan { /*colors for trashcan/uninstall widgets while dragging*/ #widget-trashcan { /*colors for trashcan/uninstall widgets while dragging*/
background-color: rgba(170, 34, 34, 0.7); background-color: rgba(170, 34, 34, 0.7);
=======
#widget-trashcan {
background-color: #a22;
>>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499
color: #ddd; color: #ddd;
font-size: 120%; font-size: 120%;
font-weight: bold; font-weight: bold;
@ -501,7 +496,6 @@ li.admin-widgetset {
margin: 2em; margin: 2em;
} }
<<<<<<< HEAD
.widget-available { /*colors for available widgets while dragging*/ .widget-available { /*colors for available widgets while dragging*/
cursor: move; cursor: move;
color: #fff; color: #fff;
@ -517,8 +511,7 @@ li.admin-widgetset {
border: 2px solid #00f; border: 2px solid #00f;
z-index: 2000; z-index: 2000;
} }
=======
>>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499
#available-widgets ul, .admin-widgetset ul { #available-widgets ul, .admin-widgetset ul {
padding-left: 0; padding-left: 0;
margin-left: 0; margin-left: 0;

12
fp-interface/themes/leggero/leggero/res/admin.css
View File

@ -14,10 +14,6 @@ Module: admin.css
@import url(common.css); @import url(common.css);
@import url(globals.css); @import url(globals.css);
<<<<<<< HEAD
=======
>>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499
/* ===== VARIOUS ===== */ /* ===== VARIOUS ===== */
.buttonbar input { .buttonbar input {
padding: .3em; padding: .3em;
@ -381,13 +377,8 @@ li.admin-widgetset {
text-align: left; text-align: left;
} }
<<<<<<< HEAD
#widget-trashcan { /*colors for trashcan/uninstall widgets while dragging*/ #widget-trashcan { /*colors for trashcan/uninstall widgets while dragging*/
background-color: rgba(170, 34, 34, 0.7); background-color: rgba(170, 34, 34, 0.7);
=======
#widget-trashcan {
background-color: #a22;
>>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499
color: #ddd; color: #ddd;
font-size: 120%; font-size: 120%;
font-weight: bold; font-weight: bold;
@ -397,7 +388,6 @@ li.admin-widgetset {
margin: 2em; margin: 2em;
} }
<<<<<<< HEAD
.widget-available { /*colors for available widgets while dragging*/ .widget-available { /*colors for available widgets while dragging*/
cursor: move; cursor: move;
color: #fff; color: #fff;
@ -414,8 +404,6 @@ li.admin-widgetset {
z-index: 2000; z-index: 2000;
} }
=======
>>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499
#available-widgets ul, .admin-widgetset ul { #available-widgets ul, .admin-widgetset ul {
padding-left: 0; padding-left: 0;
margin-left: 0; margin-left: 0;