fat_free_crm 0.11.3 → 0.11.4

data/app/assets/stylesheets/admin/{field_groups.css.scss → fields.css.scss}

@@ -1,3 +1,7 @@
 // Place all the styles related to the Admin::FieldGroups controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+.pairs .field_title {
+  color: navy;
+}

data/app/assets/stylesheets/advanced_search.css.scss

@@ -0,0 +1,79 @@
+#search {
+
+  margin-top: 15px;
+
+	.tabs {
+		background: none;
+
+		li {
+			a:link, a:visited {
+				background-color: #ddd;
+				color: #222;
+				font-weight: normal;
+			  font-size: 11px;
+			}
+			a:hover {
+				background-color: #ccc;
+			}
+			a.active {
+				background-color: #eee;
+        color: black;
+			}
+		}
+	}
+
+	.search_form {
+		border: none;
+		background-color: #eee;
+		padding: 10px;
+	}
+
+  .options {
+    float: right;
+    padding-top: 10px;
+    margin-right: 30px;
+  }
+  .options a {
+    border-bottom: 1px dotted darkCyan;
+    color: darkCyan;
+    text-decoration: none;
+  }
+
+  #query {
+    margin-top: 6px;
+  }
+
+  .combinator {
+    margin-bottom: 7px;
+    margin-top: 3px;
+  }
+  
+  #advanced_search .fields.sort { float:right; }
+
+}
+
+.defaultTextActive { color: #a1a1a1; }
+
+.remove_fields {
+  margin-right: 4px;
+  &:hover { background: none; }
+  img {
+    vertical-align: middle;
+  }
+}
+
+.select2-container, input.ransack_query {
+  vertical-align: middle;
+}
+
+.ui-datepicker-trigger {
+  vertical-align: middle;
+  margin-left: 4px;
+  margin-bottom: 5px;
+  cursor: pointer;
+}
+
+#search_results_count {
+  text-align: left;
+  padding-top: 4px;
+}

data/app/assets/stylesheets/application.css.erb

@@ -19,6 +19,7 @@
 
 /*
  *= require jquery-ui.custom
+ *= require select2
  *= require modalbox
  *= require facebooklist
  *= require rails
@@ -30,6 +31,9 @@
  *= require ffcrm_chosen
  *= require fields
  *= require textarea_autocomplete
+ *= require admin/fields
+ *= require advanced_search
+ *= require format_buttons
  *= require_self
  */
 

data/app/assets/stylesheets/base.scss

@@ -54,9 +54,9 @@ ul li {
 //------------------------------------------------------------------------------
 a {
   text-decoration: none;
-  &link, &visited {
+  &:link, &:visited {
     color: $color_link; }
-  &hover {
+  &:hover {
     background: $color_link_hover_background;
     color: $color_link_hover; }
   img {
@@ -70,7 +70,7 @@ a {
     border-bottom: 1px dotted darkcyan;
     color: darkcyan;
     text-decoration: none;
-    &hover {
+    &:hover {
       background: $color_body;
       border-bottom: 1px dotted darkblue;
       color: darkblue; } } }

data/app/assets/stylesheets/common.scss

@@ -28,6 +28,7 @@ $sidebar_width: 210px;
     size: 17px;
     weight: bold; };
   padding-bottom: 2px;
+  margin-top: 6px;
   img {
     position: relative;
     top: 2px; } }
@@ -35,7 +36,15 @@ $sidebar_width: 210px;
 .title_tools {
   font-size: 12px;
   float: right;
-  margin: 4px 0px 0px 0px; }
+  margin: 0;
+  margin-top: 4px;
+
+  .sorting_options, .create_asset {
+    margin-left: 24px;
+    display: inline-block;
+    vertical-align: top;
+  }
+}
 
 .subtitle {
   border-bottom: 1px silver solid;
@@ -50,8 +59,13 @@ $sidebar_width: 210px;
   a:link, a:visited {
     color: $color_subtitle;
     text-decoration: none; }
-  ahover: {
-    background: none; }; }
+  a:hover {
+    background: none; };
+  &.show_attributes {
+    margin-top: 6px; } }
+
+.subtitle_inline_info {
+  margin-left: 5px }
 
 .subtitle_tools {
   font-size: 11px;
@@ -137,18 +151,22 @@ $sidebar_width: 210px;
 .top {
   margin: 5px 0px 0px 0px; }
 
-.req {
+.req, label.required {
   background: url("/assets/asterisk.gif") no-repeat scroll center right transparent;
   color: navy;
   display: inline-block; }
 
+.required label {
+  padding: 0px 8px 0px 0px;
+}
+
 .intro {
   color: dimgray;
   font-size: 12px;
   padding-top: 5px; }
 
 .section {
-  background: whitesmoke;
+  background-color: whitesmoke;
   color: #3f3f3f;
   margin: 0px 0px 2px 0px;
   padding: 4px 15px 8px 15px;
@@ -316,12 +334,6 @@ $sidebar_width: 210px;
     margin: 3px 0px 0px 0px;
     padding: 3px;
     width: 500px; }
-  textarea {
-    font-size: 11px;
-    height: 110px;
-    margin: 3px 0px 0px 0px;
-    padding: 3px;
-    width: 500px; }
   .gravatar {
     float: left;
     margin: 3px 10px 3px 3px; }
@@ -342,6 +354,13 @@ $sidebar_width: 210px;
     a {
       font-size: 11px; } } }
 
+.comment textarea, textarea#comment_body {
+  font-size: 11px;
+  height: 110px;
+  margin: 3px 0px 0px 0px;
+  padding: 3px;
+  width: 500px; }
+
 // Avoid collision with .email CSS class which is used to display Task category strip.
 .mail {
   background: #f2f2f2;
@@ -423,7 +442,7 @@ $sidebar_width: 210px;
 // Two-row lists.
 //------------------------------------------------------------------------------
 .list {
-  padding: 8px 0px 0px 0px;
+  padding: 8px 0px 7px 0px;
   li {
     border-bottom: 1px silver dotted;
     clear: both;
@@ -451,7 +470,17 @@ $sidebar_width: 210px;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   -moz-box-shadow: 2px 2px 8px #bbbbbb, -2px 0px 8px #bbbbbb;
-  -webkit-box-shadow: 2px 2px 8px #bbbbbb, -2px 0px 8px #bbbbbb; }
+  -webkit-box-shadow: 2px 2px 8px #bbbbbb, -2px 0px 8px #bbbbbb;
+
+  .caption {
+    border-bottom: 1px grey solid;
+    color: navy;
+    font: {
+      size: 12px;
+      weight: bold; };
+    margin: 4px 0px 5px 0px;
+    padding: 2px 0px 2px 0px; }
+  }
 
 .filters {
   h4 {
@@ -480,14 +509,6 @@ $sidebar_width: 210px;
       font-size: 11px; }
     &.last {
       border-bottom: none; } }
-  .caption {
-    border-bottom: 1px grey solid;
-    color: navy;
-    font: {
-      size: 12px;
-      weight: bold; };
-    margin: 4px 0px 2px 0px;
-    padding: 2px 0px 2px 0px; }
   &#recently {
     background: floralwhite; }
   &#summary {
@@ -638,7 +659,7 @@ span.handle img {
 
 .tags, .list li dt .tags {
   margin-top: 4px;
-  a:link, a:visited {
+  a:link, a:visited, li {
     background-color: #eaeaea;
     color: #333333;
     font-weight: normal;
@@ -656,7 +677,11 @@ span.handle img {
     -webkit-border-radius: 3px;
     border-radius: 3px; }
   a:hover {
-    background: #dadada; } }
+    background: #dadada; }
+  li {
+    display:inline;
+  }
+}
 
 .field_group .list {
   padding-bottom: 30px; }
@@ -680,8 +705,6 @@ span.handle img {
 .fields .title {
   margin-bottom: 12px; }
 
-.remove_fields img {
-  vertical-align: text-bottom; }
 
 ul.tools {
   display: inline;
@@ -708,3 +731,27 @@ ul.tools {
   background-color: seashell;
   .tools {
     visibility: visible; } }
+
+
+table.asset_attributes {
+  width: 100%;
+  border-spacing: 4px;
+  td, th {
+    border-bottom: 1px dotted silver;
+    vertical-align: top;
+    text-align: left;
+  }
+  th {
+    font-weight: bold;
+    width: 18%;
+    padding-right: 7px;
+    text-align: right;
+  }
+  td {
+    width: 32%;
+    color: #202020;
+  }
+  td.last, th.last {
+    border-bottom: none;
+  }
+}

data/app/assets/stylesheets/fields.scss

@@ -6,3 +6,17 @@
 
 .fields .title {
   margin-bottom: 12px; }
+
+.datepair {
+  width: 80px!important;
+  display: inline!important;
+}
+
+.datetimepair {
+  width: 120px!important;
+  display: inline!important;
+}
+
+.datepair label, .datetimepair label {
+  margin: 0px 5px;
+}

data/app/assets/stylesheets/format_buttons.css.scss

@@ -0,0 +1,30 @@
+#buttons {
+  display: inline-block;
+  .create_asset, ul { display: inline; }
+  .create_asset {
+    margin-left: 24px;
+    display: inline-block;
+    vertical-align: top;
+    padding-top: 1px;
+    span.arrow {
+      display: inline-block;
+      vertical-align: middle;
+    }
+  }
+}
+
+ul.format-buttons li {
+  display: inline;
+  margin: 0 3px;
+
+  a {
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    opacity: 0.3;
+  }
+  a.active { opacity: 1; }
+  a:hover { opacity: 0.6; }
+  a:active { opacity: 1; }
+
+}

data/app/assets/stylesheets/groups.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the groups controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

data/app/assets/stylesheets/header.scss

@@ -20,8 +20,8 @@ $color_header_background: #1e4262;
 $color_logo: greenyellow;
 $color_tab: white;
 $color_tab_background: #466bb1;
-$color_active_tab: navy;
-$color_active_tab_background: azure;
+$color_active_tab: black;
+$color_active_tab_background: #E5E5E5;
 $color_hover_tab: navy;
 $color_hover_tab_background: #97baff;
 $size_tab_height: 26px;
@@ -46,7 +46,7 @@ $color_footer: grey;
       color: lightyellow;
       padding: 1px 4px 2px 4px;
       text-decoration: none;
-      &hover {
+      &:hover {
         background: $color_header_background;
         color: yellow; } }
     a.selected {
@@ -75,14 +75,14 @@ $color_footer: grey;
         padding: 0px 0px 4px 0px;
         &.selected {
           color: navy; }
-        &hover {
+        &:hover {
           background: steelblue; } } }
     #jumpbox_label {
       color: white; }
     input {
       margin: 2px 0px 0px 0px; } } }
 
-#tabs {
+.tabs {
   background: $color_header_background;
   height: $size_tab_height;
   padding: 0px;
@@ -126,4 +126,5 @@ $color_footer: grey;
 #footer {
   color: $color_footer;
   font-size: 10px;
-  padding: 0px 0px 0px 16px; }
+  padding: 0px 0px 0px 16px;
+  text-align: center; }

data/app/assets/stylesheets/print.css.scss

@@ -42,9 +42,9 @@ tt {
   font-size: 13px;
   display: inline; }
 
-td#sidebar, div#header, div#tabs, div#footer, div.title_tools, div.subtitle_tools, div.new_comment, a.toggle {
-  display: none; }
-
+td#sidebar, div#header, div.tabs, div#footer, div.title_tools, div.tools, ul.tools, div.subtitle_tools, div.new_comment, a.toggle {
+  display: none !important; }
+  
 div.section.nostyle div {
   display: block !important; }
 
@@ -78,3 +78,12 @@ table {
   td {
     strong {
       font-weight: normal; } } }
+
+.comment .body {
+  display: block; }
+
+.comment.highlight {
+  background-color: transparent; }
+  
+.task input {
+  display: none !important; }

data/app/assets/stylesheets/rails.scss

@@ -48,7 +48,7 @@
 
 // Flash messages.
 //------------------------------------------------------------------------------
-p {
+p, div {
   &.flash_warning, &.flash_error {
     background: lightpink;
     color: maroon;
@@ -103,7 +103,7 @@ div {
 
 // Pagination.
 //------------------------------------------------------------------------------
-.pagination {
+.pagination, .per_page_options {
   background: white;
   float: right;
   font-size: 11px;
@@ -125,7 +125,7 @@ div {
     text-decoration: none;
     color: #105cb6;
     border: 1px solid #9aafe5;
-    &hover, &focus {
+    &.hover, &.focus {
       color: navy;
       background: lightyellow;
       border-color: navy; } }
@@ -134,3 +134,12 @@ div {
     border: 1px solid #bbbbbb;
     font-style: normal;
     font-weight: bold; } }
+
+.per_page_options {
+  margin-top: 15px;
+  clear: both;
+
+  span.per_page_label {
+    color: #6A6A6A;
+  }
+}