Merge pull request #48 from ottemo/revert-46-poddubny-image-croper-re…

…sizer-bug-fixing

Revert "bug fixing"

app/index.html

@@ -16,10 +16,6 @@
         <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" />
         <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css" />
 
-
-
-        <link rel="stylesheet" href="themes/default/styles/cropper.css" />
-
         <!--end bootstrap styles-->
         <link ng-repeat="stylesheet in getCss()" ng-href="{{stylesheet}}" type="text/css" rel="stylesheet"/>
 
@@ -53,6 +49,7 @@
         <script src="themes/default/scripts/jquery-migrate-1.2.1.min.js"></script>
         <!--<script src="themes/default/scripts/bootstrap.min.js"></script>-->
         <script src="themes/default/scripts/modernizr.min.js"></script>
+        <script src="themes/default/scripts/jquery.nicescroll.js"></script>
 
         <!-- jQuery Flot Chart-->
         <script src="themes/default/scripts/flot-chart/jquery.flot.js"></script>

app/themes/default/scripts/scripts.js

@@ -1,6 +1,19 @@
 (function ($) {
     "use strict";
-
+
+    // custom scrollbar
+
+    $("html").niceScroll({styler: "fb", cursorcolor: "#65cea7", cursorwidth: '6', cursorborderradius: '0px', background: '#424f63', spacebarenabled: false, cursorborder: '0', zindex: '1000'});
+
+    $(".left-side").niceScroll({styler: "fb", cursorcolor: "#65cea7", cursorwidth: '3', cursorborderradius: '0px', background: '#424f63', spacebarenabled: false, cursorborder: '0'});
+
+
+    $(".left-side").getNiceScroll();
+    if ($('body').hasClass('left-side-collapsed')) {
+        $(".left-side").getNiceScroll().hide();
+    }
+
+
     function mainContentHeightAdjust() {
         // Adjust main content height
         var docHeight = $(document).height();

app/themes/default/styles/font-awesome.css

@@ -1257,4 +1257,85 @@
   content: "\f179";
 }
 .fa-windows:before {
-  con
+  content: "\f17a";
+}
+.fa-android:before {
+  content: "\f17b";
+}
+.fa-linux:before {
+  content: "\f17c";
+}
+.fa-dribbble:before {
+  content: "\f17d";
+}
+.fa-skype:before {
+  content: "\f17e";
+}
+.fa-foursquare:before {
+  content: "\f180";
+}
+.fa-trello:before {
+  content: "\f181";
+}
+.fa-female:before {
+  content: "\f182";
+}
+.fa-male:before {
+  content: "\f183";
+}
+.fa-gittip:before {
+  content: "\f184";
+}
+.fa-sun-o:before {
+  content: "\f185";
+}
+.fa-moon-o:before {
+  content: "\f186";
+}
+.fa-archive:before {
+  content: "\f187";
+}
+.fa-bug:before {
+  content: "\f188";
+}
+.fa-vk:before {
+  content: "\f189";
+}
+.fa-weibo:before {
+  content: "\f18a";
+}
+.fa-renren:before {
+  content: "\f18b";
+}
+.fa-pagelines:before {
+  content: "\f18c";
+}
+.fa-stack-exchange:before {
+  content: "\f18d";
+}
+.fa-arrow-circle-o-right:before {
+  content: "\f18e";
+}
+.fa-arrow-circle-o-left:before {
+  content: "\f190";
+}
+.fa-toggle-left:before,
+.fa-caret-square-o-left:before {
+  content: "\f191";
+}
+.fa-dot-circle-o:before {
+  content: "\f192";
+}
+.fa-wheelchair:before {
+  content: "\f193";
+}
+.fa-vimeo-square:before {
+  content: "\f194";
+}
+.fa-turkish-lira:before,
+.fa-try:before {
+  content: "\f195";
+}
+.fa-plus-square-o:before {
+  content: "\f196";
+}

app/themes/default/styles/main.css

@@ -859,8 +859,7 @@ ul {
   .LoginWrapper .LoginLogo {
     width: 540px;
     height: 110px;
-    background: url("../images/login/desktop-logo.jpg") center center no-repeat;
-    background-size: auto 100%;
+    background: url("../images/login/desktop-logo.jpg") top left no-repeat;
     margin-bottom: 30px; }
   .LoginWrapper .LoginContainer {
     background: #157ac1;
@@ -881,7 +880,7 @@ ul {
       border: 0px;
       margin-bottom: 40px;
       font-size: 24px; }
-    .LoginWrapper .LoginContainer button:not(.close) {
+    .LoginWrapper .LoginContainer button {
       height: 64px;
       line-height: 64px;
       width: 190px;
@@ -900,6 +899,7 @@ ul {
     .LoginWrapper .LoginLogo {
       width: 350px;
       height: 70px;
+      background: url("../images/login/tablet-logo.png") top left no-repeat;
       margin: 0 auto;
       margin-bottom: 30px; }
       .LoginWrapper .LoginLogo input {
@@ -920,7 +920,7 @@ ul {
       height: 45px;
       margin: 0 auto;
       margin-bottom: 40px;
-    }
+      background: url("../images/login/mobile-logo.jpg") top left no-repeat; }
     .LoginWrapper .LoginContainer {
       padding: 30px;
       width: 240px; }
@@ -1833,7 +1833,7 @@ ul {
 }
 .modal-dialog {
   width: 50%;
-  min-width: 1200px;
+  min-width: 800px;
 }
 .modal-body {
   padding: 0;

app/themes/default/styles/style.css

@@ -15,6 +15,7 @@ body {
     font-family: 'Open Sans', sans-serif;
     color: #7a7676;
     line-height: 20px;
+    overflow-x: hidden;
     font-size: 14px;
 }
 
@@ -190,12 +191,12 @@ hr {
 .sticky-left-side {
     position: fixed;
     height: 100%;
+    overflow-y: auto;
     z-index: 100;
-    overflow-y:auto;
 }
 
 .left-side-collapsed .sticky-left-side {
-
+    overflow-y: visible;
 }
 
 .logo {
@@ -208,7 +209,7 @@ hr {
     color: #fff;
     margin: 0 0 0 20px;
     text-decoration: none;
-    display: inline-block;89
+    display: inline-block;
 }
 
 .logo-icon {
@@ -898,6 +899,7 @@ h5.left-nav-title {
 .main-content {
     margin-left: 282px;
     background: #eff0f4;
+    min-height: 1000px;
 }
 
 .page-heading {

app/themes/default/views/design/gui/editor/pictureManager.html

@@ -2,12 +2,11 @@
 
     <div class="row">
         <div class="col-md-4"></div>
-        <div class="col-md-3 ">
+        <div class="col-md-3">
             <a href="" class="thumbnail">
                 <img ng-src="{{getImage(parent.selectedImage)}}" alt="selected image" class="img-thumbnail">
             </a>
         </div>
-        <div class="img-preview"></div>
         <div class="col-md-4"></div>
     </div>
 
@@ -34,5 +33,4 @@
             Default
         </button>
     </div>
-
 </div>

app/themes/default/views/index.html

@@ -4,7 +4,6 @@
 <add-css src="main.css"></add-css>
 
 
-
 <!-- main content start-->
 <section class="main-content">
 

app/themes/default/views/login.html

@@ -7,7 +7,7 @@
 <div class="LoginWrapper" ng-controller="loginLoginController">
     <div class="LoginLogo"></div>
     <div class="LoginContainer">
-        <gui-message-manager item="message"></gui-message-manager>
+
         <form role="form" name="loginForm">
             <label for="username">User Name or Email Address</label>
             <input id="username" type="text" ng-model="loginCredentials.email" required auto-fill-sync/>
@@ -20,17 +20,4 @@
 
         <div class="clear"></div>
     </div>
-</div>
-
-<style>
-    .alert-warning {
-        background: white;
-        padding: 23px;
-        border-radius: 0;
-        margin-bottom: 40px;
-    }
-    .alert-warning > div {
-        font-size: 19px;
-        color: #767676;
-    }
-</style>
+</div>