wip: stylesheets cleanup

lib/Alchemy/Phrasea/Controller/Prod/RootController.php

@@ -45,7 +45,7 @@ class RootController extends Controller
             return $this->app->redirectPath('logout');
         }
 
-        $cssPath = $this->app['root.path'] . '/www/assets/prod/';
+        $cssPath = $this->app['root.path'] . '/www/assets/prod/skins';
 
         $css = [];
 

lib/classes/eventsmanager/notify/orderdeliver.php

@@ -26,7 +26,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
      */
     public function icon_url()
     {
-        return '/skins/prod/000000/images/disktt_history.png';
+        return '/assets/common/images/icons/disktt_history.png';
     }
 
     /**

lib/classes/eventsmanager/notify/ordernotdelivered.php

@@ -24,7 +24,7 @@ class eventsmanager_notify_ordernotdelivered extends eventsmanager_notifyAbstrac
 
     public function icon_url()
     {
-        return '/skins/prod/000000/images/disktt_history.png';
+        return '/assets/common/images/icons/disktt_history.png';
     }
 
     public function datas(array $data, $unread)

resources/gulp/components/prod.js

@@ -23,22 +23,35 @@ gulp.task('build-permaview',  function(){
     return utils.buildJsGroup(permaviewGroup, 'permaview', 'permaview/js');
 });
 
+gulp.task('copy-prod-skin-black-images', function(){
+    return gulp.src([
+            config.paths.src + 'prod/skins/000000/images/**/*'
+    ])
+        .pipe(gulp.dest( config.paths.build + 'prod/skins/000000/images'));
+});
+
+gulp.task('copy-prod-skin-grey-images', function(){
+    return gulp.src([
+            config.paths.src + 'prod/skins/959595/images/**/*'
+        ])
+        .pipe(gulp.dest( config.paths.build + 'prod/skins/959595/images'));
+});
 
 gulp.task('copy-prod-images', function(){
     return gulp.src([config.paths.src + 'prod/images/**/*'])
         .pipe(gulp.dest( config.paths.build + 'prod/images'));
 });
 
-gulp.task('build-prod-skin-black', function(){
+gulp.task('build-prod-skin-black', ['copy-prod-skin-black-images'], function(){
     return utils.buildCssGroup([
-        config.paths.src + 'prod/styles/skin-000000.scss'
+        config.paths.src + 'prod/skins/000000/skin-000000.scss'
-    ], 'skin-000000', 'prod/css/');
+    ], 'skin-000000', 'prod/skins/000000/');
 });
 
-gulp.task('build-prod-skin-grey', function(){
+gulp.task('build-prod-skin-grey', ['copy-prod-skin-grey-images'], function(){
     return utils.buildCssGroup([
-        config.paths.src + 'prod/styles/skin-959595.scss'
+        config.paths.src + 'prod/skins/959595/skin-959595.scss'
-    ], 'skin-959595', 'prod/css/');
+    ], 'skin-959595', 'prod/skins/959595/');
 });
 
 gulp.task('build-prod-css', ['build-prod-skin-black', 'build-prod-skin-grey'], function(){

resources/www/_shared/styles/_geonames.scss

@@ -1,3 +1,4 @@
+@import 'variables';
 .geocompleter-menu {
     max-height: 180px;
     overflow-y: auto;

resources/www/_shared/styles/_main-menu.scss

@@ -0,0 +1,74 @@
+@import 'variables';
+
+#mainMenu{
+  height:30px;
+  bottom:auto;
+  -moz-border-radius-bottomleft:4px;
+  -moz-border-radius-bottomright:4px;
+  z-index:100;
+  line-height:30px;
+}
+
+#mainMenu ol{
+  display: block;
+  margin:0;
+  padding:0;
+  list-style: none outside none;
+}
+
+#mainMenu li{
+  display: inline-block;
+  float:left;
+  line-height: 30px;
+  padding: 0;
+  position: relative;
+  vertical-align: top;
+}
+#mainMenu span.selected{
+  border-top:3px solid white;
+}
+
+#mainMenu span{
+  display: block;
+  padding:0 5px;
+}
+
+#mainMenu .title{
+  font-size:18px;
+  color:#F7F7F7;
+  margin:0 5px;
+}
+
+#mainMenu a:hover span{
+  background-color:#FFFFFF;
+  color:black;
+}
+
+#mainMenu span{
+  color:#b1b1b1;
+  font-size:12px;
+  font-weight:normal;
+  border-top:3px solid transparent;
+}
+
+#mainMenu a{
+  text-decoration:none;
+  display:inline-block;
+}
+
+#mainMenu #notification_box a {
+  margin-left:0;
+}
+
+#mainMenu .account a{
+  text-decoration:underline;
+}
+
+#mainMenu b{
+  color:#EDEDED;
+  font-weight:bold;
+}
+
+#mainMenu nobr{
+  padding:0 5px;
+}

resources/www/_shared/styles/_notification.scss

@@ -0,0 +1,104 @@
+@import 'variables';
+
+#notification_trigger{
+  cursor:pointer;
+}
+
+#notification_trigger .counter{
+  border:1px solid white;
+  background:red;
+  -moz-border-radius:8px;
+  -webkit-border-radius:8px;
+  font-size:10px;
+  font-weight:bold;
+  display:inline-block;
+  line-height:12px;
+  margin:0;
+  padding:2px 4px;
+}
+
+#notification_trigger.open a span{
+  color:black;
+}
+
+#notification_trigger.open{
+  background-color:white;
+  border-bottom:1px solid white;
+}
+
+#notification_trigger.unread{
+
+}
+
+
+#notification_box{
+  background-color:white;
+  border:1px solid black;
+  border-top:none;
+  position:absolute;
+  height:150px;
+  top:30px;
+  overflow-y:auto;
+  overflow-x:hidden;
+  z-index:668;
+  right:20px;
+  color:black;
+}
+
+#notification_box div.notification span.time{
+  color:#414141;
+  font-size:11px;
+  white-space:nowrap;
+  margin-left:0;
+}
+
+#notification_box div.notification a{
+  color:#999999;
+  text-decoration:none;
+}
+
+#notification_box div.notification a:hover{
+  text-decoration:underline;
+}
+
+#notification_box div.notification{
+  padding:5px 10px;
+}
+#notification_box div.notification.hover{
+  background-color:#E1E1E1;
+}
+
+#notification_box div.notification.unread{
+  background-color:#E1E1E1;
+}
+
+#notification_box div.notification_title a{
+  font-size:13px;
+  font-weight:bold;
+  color:blue;
+}
+
+#notification_box div.notification_title{
+  text-align:center;
+  padding:10px 0;
+}
+
+#notifications-dialog a{
+  color:#999999;
+}
+#notifications-dialog a:hover{
+  color:#D9D9D9;
+  text-decoration:underline
+}
+
+#notifications-dialog .time{
+  font-size:10px;
+  color:#666666;
+}
+#notifications-dialog .notification_title{
+  padding:10px 0 5px;
+}
+#notifications-dialog .notification_next{
+  text-align:center;
+  padding:15px 0;
+}

resources/www/_shared/styles/_variables.scss

@@ -0,0 +1,2 @@
+$fontAwesomePath:   '/assets/common/font' !default; // dist path
+$iconsPath: '/assets/common/images/icons/' !default;

resources/www/_shared/styles/main.scss

@@ -0,0 +1,74 @@
+@import 'variables';
+
+/** skin/common/main.css */
+body{
+  margin:0;
+  padding:0;
+  font-family:Helvetica,Arial,sans-serif;
+  font-size:12px;
+  overflow:hidden;
+}
+
+
+img{
+  border:none;
+}
+
+#MODALDL{
+  z-index:1200;
+}
+
+#tooltip{
+  color:black;
+  position:absolute;
+  z-index:32000;
+  overflow:hidden;
+}
+
+#tooltip hr{
+  margin: 8px 0;
+}
+
+
+.PNB
+{
+  position:absolute;
+  top:0;
+  left:0;
+  right:0;
+  bottom:0;
+}
+.PNB10
+{
+  position:absolute;
+  top:10px;
+  left:10px;
+  right:10px;
+  bottom:10px;
+}
+
+input.checkbox{
+  background:transparent;
+  border:none;
+}
+
+#ui-datepicker-div{
+  display:none;
+}
+
+#tooltip .popover {
+  max-width: none;
+  width: auto;
+}
+
+.ui-dialog-titlebar {
+  min-height: 20px;
+}
+
+.ui-dialog[aria-describedby="p4_alerts"]{
+  z-index:2000 !important;
+}
+
+@import 'geonames';
+@import "notification";
+@import "main-menu";

resources/www/account/styles/main.scss

@@ -1,11 +1,9 @@
-$fontAwesomePath:   "../../common/font"; // dist path
-$iconsPath: '../../../assets/common/images/icons/';
 @import '../../../../www/bower_components/normalize-css/normalize'; // not extension for inline import
 @import '../../vendors/bootstrap/bootstrap';
+@import '../../_shared/styles/variables';
 // @TODO enable importation of: @import "../../../../plugins/login.less";
 @import 'variables';
 
 @import 'skin';
-@import '../../shared/styles/skin/geonames';
 @import '../../../../www/bower_components/font-awesome/sass/font-awesome.scss';
 @import '../../../../www/bower_components/jquery-ui/themes/base/jquery.ui.autocomplete'; // not extension for inline import

resources/www/admin/styles/main.scss

@@ -1,11 +1,9 @@
-$skinsPath: '../../../skins/';
+@import '../../_shared/styles/variables';
-$iconsPath: '../../../assets/common/images/icons/';
 
 @import '../../vendors/jquery-treeview/jquery.treeview'; // to inline import css file, don't put extension
 @import '../../../../www/bower_components/jquery-file-upload/css/jquery.fileupload-ui'; // to inline import css file, don't put extension
 @import '../../vendors/jquery-contextmenu/styles/jquery.contextmenu';
-@import '../../shared/styles/skin/main';
+@import '../../_shared/styles/main';
-@import '../../shared/styles/skin/geonames';
 
 /******* GLOBAL CSS for ADMIN *************************************************/
 body {

resources/www/common/styles/main.scss

@@ -3,12 +3,7 @@
  */
 @import '../../vendors/bootstrap/bootstrap';
 @import '../../vendors/bootstrap/responsive';
-$fontAwesomePath:   "../font"; // dist path
+@import '../../_shared/styles/variables';
-$iconsPath: '../../../assets/common/images/icons/';
 @import '../../../../www/bower_components/font-awesome/sass/font-awesome.scss';
 
-// to inline import css file, don't put extension
+@import '../../_shared/styles/main';
-// assets/fancytree/dist/skin-win8/ui.fancytree.min.css
-
-@import '../../shared/styles/skin/main';
-@import '../../shared/styles/skin/geonames';

resources/www/lightbox/styles/main-ie6.scss

@@ -1,4 +1,4 @@
-$iconsPath: '../../../assets/common/images/icons/';
+@import '../../_shared/styles/variables';
 $lightboxPath: '../images/';
 @import '../../vendors/jquery-contextmenu/styles/jquery.contextmenu';
 

resources/www/lightbox/styles/main.scss

@@ -1,4 +1,4 @@
-$iconsPath: '../../../assets/common/images/icons/';
+@import '../../_shared/styles/variables';
 $lightboxPath: '../images/';
 @import '../../vendors/jquery-contextmenu/styles/jquery.contextmenu';