Merge pull request #2 from ronso0/lib-redesign-LateNight-fix

LateNight: fix screwed library (lib redesign)
daschuer · Mar 11, 2018 · d9b6033 · d9b6033
2 parents 8de673f + db950d8
commit d9b6033
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 356 deletions.
diff --git a/res/skins/LateNight/123ToDo b/res/skins/LateNight/123ToDo
diff --git a/res/skins/LateNight/library.xml b/res/skins/LateNight/library.xml
@@ -25,7 +25,6 @@
             <Collapsible>1,0</Collapsible>
             <Children>
               <WidgetGroup>
-                <ObjectName>LibrarySidebar_X</ObjectName>
                 <Layout>vertical</Layout>
                 <SizePolicy>min,me</SizePolicy>
                 <MinimumSize>100,-1</MinimumSize>
@@ -45,14 +44,7 @@
                     <Collapsible>0,0</Collapsible>
                     <Children>
                       <!--Library Tree View-->
-                      <WidgetGroup>
-                        <ObjectName>SidebarContainer</ObjectName>
-                        <Size>1min,50min</Size>
-                        <Layout>vertical</Layout>
-                        <Children>
-                          <LibrarySidebar></LibrarySidebar>
-                        </Children>
-                      </WidgetGroup>
+                      <LibrarySidebar></LibrarySidebar>
                       <!--Cover Art-->
                       <CoverArt>
                         <SizePolicy>me,me</SizePolicy>
@@ -67,17 +59,13 @@
 
                 </Children>
               </WidgetGroup>
-              <WidgetGroup>
-                <!-- Library Table-->
-                <Style>QGroupBox {}</Style>
-                <Layout>vertical</Layout>
-                <Children>
-                  <Library>
-                    <BgColor>#585858</BgColor>
-                    <FgColor>#eece33</FgColor>
-                  </Library>
-                </Children>
-              </WidgetGroup>
+
+              <!-- Library Table-->
+              <Library>
+                <BgColor>#585858</BgColor>
+                <FgColor>#eece33</FgColor>
+              </Library>
+
             </Children>
           </Splitter>
 

diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
@@ -1356,9 +1356,9 @@ WEffectSelector {
 
 /* Library styling is hard */
 
-#LibrarySingleton {
+#LibrarySingleton {/*
   padding-top: 5px;
-  padding-bottom: 2px;
+  padding-bottom: 2px;*/
 }
 
 #Library {
@@ -1437,10 +1437,6 @@ WEffectSelector {
   background-color: #191919;
 }
 
-#LibrarySidebarExpanded {
-  margin: -5px 0px 0px 5px;
-}
-
 #LibrarySidebarExpanded QPushButton {
   margin: 2px 3px 2px 3px; 
   padding: 4px 6px; 
@@ -1503,9 +1499,7 @@ WLibraryBreadCrumb QToolButton {
 
 WBaseLibrary QLabel {
   padding: 0px 0px 0px 0px;
-  margin: 100px 100px 100px 100px;
-  background-color: blue;
-  border: 0px solid blue;
+  margin: 0px;
 }
 
 QTreeView::item:selected:active, 
@@ -1654,41 +1648,22 @@ QSpinBox {
 }
 
 /* library search bar */
-<<<<<<< HEAD
 WSearchLineEdit { 
   margin-bottom: 2px;
   padding: 2px; 
   border: 1px solid #656565; 
   background: #181818; 
   color: #cfb32c; 
 }
-
-
-WSearchLineEdit:focus { 
-  border: 1px solid #8E5C00;
-  background: #0f0f0f; 
-  color: #eece33;
-}
-
-||||||| merged common ancestors
-WSearchLineEdit { padding: 2px; border: 1px solid #656565; background: #181818; color: #cfb32c; }
-WSearchLineEdit:focus { padding: 2px; border: 2px solid #FF6600; background: #0f0f0f; color: #eece33;}
-=======
-WSearchLineEdit {
-  padding: 2px;
-  border: 1px solid #656565;
-  background: #181818;
-  color: #cfb32c;
-}
 WSearchLineEdit:focus {
   padding: 2px;
   border: 2px solid #FF6600;
   background: #0f0f0f;
 }
->>>>>>> fbf7cc1e61124f86902a692197249aea60281c38
 
 #SidebarContainer{
-    margin-top: -5px;
+  margin: 0px;
+  padding: 0px;
 }
 
 /* cover art */

diff --git a/res/skins/LateNight/style@1x.qss b/res/skins/LateNight/style@1x.qss