1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-05 05:25:27 +02:00

upgraded Ember and integrated Bootstrap 4

Upgraded to Ember JS 2.16.x release. This upgrade uses the new JavaScript modules API syntax.

Integrated Bootstrap 4 Beta 2 via package.json and associated popper.js library. Overridden Bootstrap styles using bootstrap.scss -- this file selectively imports the modules we need.
This commit is contained in:
Harvey Kandola 2017-11-16 13:28:05 +00:00
parent 0f04be4ea1
commit b31ab712c1
229 changed files with 1610 additions and 3181 deletions

View file

@ -12,6 +12,7 @@
@import "font.scss";
@import "mixins.scss";
@import "base.scss";
@import "bootstrap.scss";
@import "widget/widget.scss";
@import "view/layout-sidebar.scss";
@import "view/page-search.scss";

View file

@ -9,105 +9,10 @@
//
// https://documize.com
.cursor-pointer {
cursor: pointer;
}
.cursor-not-allowed {
cursor: not-allowed !important;
}
.cursor-auto {
cursor: auto !important;
}
.vertical-top {
vertical-align: top;
}
.inline-block {
display: inline-block;
}
.text-left {
text-align: left;
}
.text-right {
text-align: right;
}
.text-center {
text-align: center;
}
.center {
margin: 0 auto;
}
.bold {
font-weight: bold;
}
.italic {
font-style: italic;
}
.text-uppercase {
text-transform: uppercase;
}
.truncate {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
// requires element to specify width
.absolute-center {
margin: auto;
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
}
.no-width {
white-space: nowrap;
width: 1%;
}
.no-float {
float: none !important;
}
.no-overflow-x {
overflow-x: visible !important;
}
.no-display {
display: none;
}
input:-webkit-autofill {
-webkit-box-shadow: 0 0 0 1000px white inset;
}
img.responsive-img,
video.responsive-video {
max-width: 100%;
height: auto;
}
.bordered {
border: 1px solid $color-border;
}
html {
overflow-y: scroll;
font-family: $font-regular;
font-size: 14px;
font-size: 0.875rem;
height: 100%;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
@ -149,6 +54,75 @@ a.alt {
}
}
.no-outline {
outline: none !important;
border: none !important;
box-shadow: none !important;
&:active,
&:focus {
border: none !important;
box-shadow: none !important;
}
}
.no-select {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
-o-user-select: none;
user-select: none;
}
ul {
margin: 0;
padding: 0;
li {
list-style: none;
list-style-type: none;
}
}
.cursor-pointer {
cursor: pointer;
}
.cursor-auto {
cursor: auto !important;
}
.no-width {
white-space: nowrap;
width: 1%;
}
.absolute-center {
margin: auto;
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
}
input:-webkit-autofill {
-webkit-box-shadow: 0 0 0 1000px white inset;
box-shadow: 0 0 0 1000px white inset;
}
.bordered {
border: 1px solid $color-border;
}
.text-truncate {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
$i: 150;
@while $i > 0 {
.margin-#{$i} {
@ -204,45 +178,3 @@ $i: 100;
}
$i: $i - 1;
}
.no-outline {
outline: none !important;
border: none !important;
box-shadow: none !important;
&:active,
&:focus {
border: none !important;
box-shadow: none !important;
}
}
.no-select {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
-o-user-select: none;
user-select: none;
}
ul {
margin: 0;
padding: 0;
li {
list-style: none;
list-style-type: none;
}
}
.clearfix:after,
.clearfix:before {
content: " ";
display: table;
}
.clearfix:after {
clear: both;
}

96
gui/app/styles/bootstrap.scss vendored Normal file
View file

@ -0,0 +1,96 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
//
// This software (Documize Community Edition) is licensed under
// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
//
// You can operate outside the AGPL restrictions by purchasing
// Documize Enterprise Edition and obtaining a commercial license
// by contacting <sales@documize.com>.
//
// https://documize.com
//
// Variable overrides
//
// colors
$blue: $color-primary;
$red: $color-red;
$green: $color-green;
$secondary: $color-gray;
$light: $color-white;
$dark: $color-off-black;
// popover
$popover-bg: $color-off-white;
$popover-header-bg: $color-off-white;
$popover-header-color: $color-off-black;
// tooltip
$tooltip-bg: $color-off-white;
$tooltip-color: $color-off-black;
// modal
$modal-backdrop-opacity: 0.7;
$modal-header-border-color: $color-white;
$modal-footer-border-color: $color-white;
.modal-header {
background-color: $color-gray;
color: $color-off-white;
font-size: 1.2rem;
}
// rounded corners
// $border-radius: 0rem;
// $border-radius-lg: 0rem;
// $border-radius-sm: 0rem;
$border-radius: .125rem;
$border-radius-lg: .15rem;
$border-radius-sm: .1rem;
// dropdown
$dropdown-link-color: $color-off-black;
$dropdown-link-hover-color: $color-primary;
$dropdown-link-hover-bg: $color-white;
$dropdown-link-active-color: $color-primary;
$dropdown-link-active-bg: $color-white;
// form
$input-color: $color-off-black;
$input-border-color: $color-stroke;
$input-focus-bg: $color-white;
$input-focus-border-color: $color-gray;
$input-focus-color: $color-off-black;
$input-placeholder-color: $color-gray;
$input-focus-border-color: $color-stroke;
$input-btn-focus-width: .2rem;
$input-btn-focus-color: rgba($color-gray, .25);
// font
// $font-family-sans-serif: "Helvetica", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
//
// Bootstrap includes
//
// Required
@import "node_modules/bootstrap/scss/functions";
@import "node_modules/bootstrap/scss/variables";
@import "node_modules/bootstrap/scss/mixins";
// Optional
@import "node_modules/bootstrap/scss/reboot";
@import "node_modules/bootstrap/scss/grid";
@import "node_modules/bootstrap/scss/buttons";
@import "node_modules/bootstrap/scss/button-group";
@import "node_modules/bootstrap/scss/dropdown";
@import "node_modules/bootstrap/scss/forms";
@import "node_modules/bootstrap/scss/input-group";
@import "node_modules/bootstrap/scss/modal";
@import "node_modules/bootstrap/scss/utilities";
@import "node_modules/bootstrap/scss/popover";
@import "node_modules/bootstrap/scss/tooltip";
// @import "node_modules/bootstrap/scss/images";
// @import "node_modules/bootstrap/scss/navbar";

View file

@ -16,14 +16,14 @@ $color-border: #f3f5f8;
// Theme-neutral colors
$color-off-white: #f5f5f5;
$color-off-black: #393939;
$color-off-black: #111111;
$color-black: #000000;
$color-white: #ffffff;
$color-red: #d04134;
$color-green: #4caf50;
$color-blue: #2667af;
$color-gray: #8b9096;
$color-gray: #8e969e; //8b9096
$color-goldy: #cc9933;
$color-table-border: #e1e1e1;

View file

@ -10,12 +10,6 @@
z-index: 999;
width: 100%;
}
@mixin box-shadow($spec)
{
-webkit-box-shadow: $spec;
-moz-box-shadow: $spec;
box-shadow: $spec;
}
@mixin border-radius($radius)
{
@ -24,68 +18,6 @@
border-radius: $radius;
}
@mixin border-radius-top-right($radius)
{
-webkit-border-top-right-radius: $radius;
-moz-border-radius-topright: $radius;
border-top-right-radius: $radius;
}
@mixin border-radius-top-left($radius)
{
-webkit-border-top-left-radius: $radius;
-moz-border-radius-topleft: $radius;
border-top-left-radius: $radius;
}
@mixin border-radius-bottom-right($radius)
{
-webkit-border-bottom-right-radius: $radius;
-moz-border-radius-bottomright: $radius;
border-bottom-right-radius: $radius;
}
@mixin border-radius-bottom-left($radius)
{
-webkit-border-bottom-left-radius: $radius;
-moz-border-radius-bottomleft: $radius;
border-bottom-left-radius: $radius;
}
@mixin border-radius-none()
{
-webkit-border-radius: none;
-moz-border-radius: none;
border-radius: none;
-webkit-border-top-right-radius: none;
-moz-border-radius-topright: none;
border-top-right-radius: none;
-webkit-border-top-left-radius: none;
-moz-border-radius-topleft: none;
border-top-left-radius: none;
}
@mixin border($width)
{
border: $width solid $color-border !important;
}
@mixin border-left($width)
{
border-left: $width solid $color-border;
}
@mixin border-right($width)
{
border-right: $width solid $color-border;
}
@mixin border-top($width)
{
border-top: $width solid $color-border;
}
@mixin border-bottom($width)
{
border-bottom: $width solid $color-border;
}
@mixin ease-in()
{
-webkit-transition: all 0.30s ease-in-out;
@ -95,107 +27,9 @@
transition: all 0.30s ease-in-out;
}
@mixin arrow-down($color, $size)
{
width: 0;
height: 0;
border-left: $size solid transparent;
border-right: $size solid transparent;
border-top: $size solid $color;
}
@mixin content-container($pad-tb: 25px, $pad-lr: 50px) {
@include border-radius(2px);
padding: $pad-tb $pad-lr;
box-shadow: 0 0 0 0.75pt $color-stroke,0 0 3pt 0.75pt $color-stroke;
background-color: $color-white;
}
.dotted
{
border-bottom: 1px dotted $color-gray;
}
// Mixins from http://zerosixthree.se/8-sass-mixins-you-must-have-in-your-toolbox/
@function calculateRem($size) {
$remSize: $size / 16px;
@return $remSize * 1rem;
}
@mixin font-size($size) {
font-size: $size;
font-size: calculateRem($size);
}
@mixin keyframes($animation-name) {
@-webkit-keyframes #{$animation-name} {
@content;
}
@-moz-keyframes #{$animation-name} {
@content;
}
@-ms-keyframes #{$animation-name} {
@content;
}
@-o-keyframes #{$animation-name} {
@content;
}
@keyframes #{$animation-name} {
@content;
}
}
@mixin animation($str) {
-webkit-animation: #{$str};
-moz-animation : #{$str};
-ms-animation : #{$str};
-o-animation : #{$str};
animation : #{$str};
}
@mixin transition($args...) {
-webkit-transition: $args;
-moz-transition : $args;
-ms-transition : $args;
-o-transition : $args;
transition : $args;
}
@mixin opacity($opacity) {
opacity: $opacity;
$opacity-ie: $opacity * 100;
filter: alpha(opacity=$opacity-ie); //IE8
}
@keyframes fadein {
from { opacity: 0; }
to { opacity: 1; }
}
/* Firefox < 16 */
@-moz-keyframes fadein {
from { opacity: 0; }
to { opacity: 1; }
}
/* Safari, Chrome and Opera > 12.1 */
@-webkit-keyframes fadein {
from { opacity: 0; }
to { opacity: 1; }
}
/* Internet Explorer */
@-ms-keyframes fadein {
from { opacity: 0; }
to { opacity: 1; }
}
/* Opera < 12.1 */
@-o-keyframes fadein {
from { opacity: 0; }
to { opacity: 1; }
}

View file

@ -20,7 +20,7 @@
font-size: 0.9rem;
color: $color-gray;
width: 200px;
@extend .truncate;
@extend .text-truncate;
}
> .detail {
@ -29,7 +29,7 @@
color: $color-off-black;
margin-left: 50px;
width: 200px;
@extend .truncate;
@extend .text-truncate;
.viewed {
color: $color-goldy;

View file

@ -35,7 +35,7 @@
}
> a {
@extend .truncate;
@extend .text-truncate;
width: 80%;
color: $color-gray;
@ -44,7 +44,7 @@
}
> .file {
@extend .truncate;
@extend .text-truncate;
display: inline-block;
font-size: 0.9rem;
width: 80%;

View file

@ -13,7 +13,7 @@
}
> .disabled {
@extend .cursor-not-allowed;
cursor: not-allowed !important;
color: $color-stroke;
border-color: $color-stroke;

View file

@ -4,11 +4,11 @@
color: $color-wysiwyg;
table {
@include border(1px);
border: 1px solid $color-border !important;
td {
padding: 5px 7px !important;
@include border(1px);
border: 1px solid $color-border !important;
p {
margin: 0 !important;

View file

@ -1,7 +1,7 @@
.documize-base-exception
{
background-color: $color-off-white;
@include border(1px);
border: 1px solid $color-border !important;
margin: 20px;
padding: 20px;
text-align: left;

View file

@ -120,7 +120,7 @@
> li.disabled {
color: $color-stroke !important;
font-weight: normal !important;
@extend .cursor-not-allowed;
cursor: not-allowed !important;
a, a:visited {
color: $color-stroke !important;