mirror of
https://github.com/Doodle3D/doodle3d-client.git
synced 2024-11-22 17:27:57 +01:00
Merge branch 'text-experiment' of github.com:Doodle3D/doodle3d-client into text-experiment
This commit is contained in:
Wouter R
commit
fd6c55b69e
@ -64,10 +64,6 @@ body {
|
|||||||
@import "base_leftpanel.less";
|
@import "base_leftpanel.less";
|
||||||
@import "base_rightpanel.less";
|
@import "base_rightpanel.less";
|
||||||
|
|
||||||
|
|
||||||
// import vertical shapes additions
|
|
||||||
@import "verticalshapes.less";
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
REST
|
REST
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
top: 0;
|
top: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
padding-top: 2%; /* reserve space for status message */
|
//padding-top: 2%; /* reserve space for status message */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -44,19 +44,14 @@
|
|||||||
width: 80%;
|
width: 80%;
|
||||||
margin: 1% 5%;
|
margin: 1% 5%;
|
||||||
max-width: 160px;
|
max-width: 160px;
|
||||||
}
|
.btn {
|
||||||
|
width: 46%;
|
||||||
#btnInfo {
|
|
||||||
width: 40%;
|
|
||||||
max-width: 53px;
|
|
||||||
height: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
#btnSettings {
|
|
||||||
width: 40%;
|
|
||||||
max-width: 53px;
|
max-width: 53px;
|
||||||
height: auto;
|
height: auto;
|
||||||
|
}
|
||||||
|
#btnSettings {
|
||||||
float: right;
|
float: right;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#btnNew {
|
#btnNew {
|
||||||
@ -173,13 +168,14 @@
|
|||||||
#buttonGroupAdd {
|
#buttonGroupAdd {
|
||||||
display: none;
|
display: none;
|
||||||
z-index: 1000;
|
z-index: 1000;
|
||||||
|
position: relative;
|
||||||
margin-top: -60%;
|
margin-top: -60%;
|
||||||
left: 60px;
|
margin-left: 70%;
|
||||||
width: 140px; /*fixme: can this grow based on it's content?*/
|
width: 200%;
|
||||||
|
max-width: 140px; /*fixme: can this grow based on it's content?*/
|
||||||
|
padding: 5% 0 5% 5%;
|
||||||
#btnWordArt, #btnShape {
|
#btnWordArt, #btnShape {
|
||||||
width: 60px; /* scaled down >50% */
|
width: 45%;
|
||||||
float: left;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -200,6 +196,16 @@
|
|||||||
left: 6px;
|
left: 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media only screen and (max-height: 480px),
|
||||||
|
only screen and (max-width: 600px) and (min-device-pixel-ratio : 1.5),
|
||||||
|
only screen and (max-width: 600px) and (-webkit-min-device-pixel-ratio : 1.5) {
|
||||||
|
#buttonGroupVerticalShapes {
|
||||||
|
#btnConv, #btnDiv, #btnSine, #btnStraight {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,142 +0,0 @@
|
|||||||
/* Tourbus leg definitions element */
|
|
||||||
.tourbus-legs {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
/* Container for tourbus leg */
|
|
||||||
.tourbus-leg {
|
|
||||||
position: absolute;
|
|
||||||
visibility: hidden;
|
|
||||||
top: 0;
|
|
||||||
border: 1px solid #E5E5E5;
|
|
||||||
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
|
|
||||||
border-radius: 4px;
|
|
||||||
background: white;
|
|
||||||
|
|
||||||
/*
|
|
||||||
remove top padding/margin on headings
|
|
||||||
because the interior of the leg has padding
|
|
||||||
*/
|
|
||||||
h1, h2, h3, h4, h5, h6 {
|
|
||||||
margin-top: 0;
|
|
||||||
padding-top: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Interior of leg, clearfixed */
|
|
||||||
.tourbus-leg-inner {
|
|
||||||
padding: 20px;
|
|
||||||
position: relative;
|
|
||||||
zoom: 1;
|
|
||||||
}
|
|
||||||
.tourbus-leg-inner:before,
|
|
||||||
.tourbus-leg-inner:after {
|
|
||||||
content: "\0020";
|
|
||||||
display: block;
|
|
||||||
height: 0;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
.tourbus-leg-inner:after {
|
|
||||||
clear: both;
|
|
||||||
}
|
|
||||||
|
|
||||||
.prevnextBtn {
|
|
||||||
border: 1px solid #8e8e8e;
|
|
||||||
color: #252525;
|
|
||||||
border-radius: 4px;
|
|
||||||
padding: 4px 8px;
|
|
||||||
background-color: #eaeaea;
|
|
||||||
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.7);
|
|
||||||
-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.7);
|
|
||||||
box-shadow: 0 0 3px rgba(0, 0, 0, 0.7);
|
|
||||||
margin-right: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Tourbus leg arrow */
|
|
||||||
.tourbus-arrow:before,
|
|
||||||
.tourbus-arrow:after {
|
|
||||||
border: solid rgba(0, 0, 0, 0);
|
|
||||||
content: " ";
|
|
||||||
height: 0;
|
|
||||||
width: 0;
|
|
||||||
position: absolute;
|
|
||||||
pointer-events: none;
|
|
||||||
border-color: transparent;
|
|
||||||
}
|
|
||||||
/* set the :after to be the _interior_ size of the arrow */
|
|
||||||
/* set the :before to be the _interior + desired border width_ */
|
|
||||||
.tourbus-arrow:after {
|
|
||||||
border-width: 14px;
|
|
||||||
}
|
|
||||||
.tourbus-arrow:before {
|
|
||||||
border-width: 16px;
|
|
||||||
}
|
|
||||||
/* Arrow background and border colors */
|
|
||||||
/*
|
|
||||||
change margin-top/left values here to
|
|
||||||
match the border width for :after above
|
|
||||||
|
|
||||||
border colors here are for the _interior_ of the arrow
|
|
||||||
*/
|
|
||||||
.tourbus-arrow-right:after {
|
|
||||||
border-right-color: #ffffff;
|
|
||||||
margin-top: -14px;
|
|
||||||
top: 50%;
|
|
||||||
}
|
|
||||||
.tourbus-arrow-left:after {
|
|
||||||
border-left-color: #ffffff;
|
|
||||||
margin-top: -14px;
|
|
||||||
top: 50%;
|
|
||||||
}
|
|
||||||
.tourbus-arrow-bottom:after {
|
|
||||||
border-bottom-color: #ffffff;
|
|
||||||
margin-left: -14px;
|
|
||||||
left: 50%;
|
|
||||||
}
|
|
||||||
.tourbus-arrow-top:after {
|
|
||||||
border-top-color: #ffffff;
|
|
||||||
margin-left: -14px;
|
|
||||||
left: 50%;
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
change margin-top/left values here to
|
|
||||||
match the border width for :before above
|
|
||||||
|
|
||||||
border colors here are for the _border_ of the arrow
|
|
||||||
*/
|
|
||||||
.tourbus-arrow-right:before {
|
|
||||||
border-right-color: #e5e5e5;
|
|
||||||
margin-top: -16px;
|
|
||||||
top: 50%;
|
|
||||||
}
|
|
||||||
.tourbus-arrow-left:before {
|
|
||||||
border-left-color: #e5e5e5;
|
|
||||||
margin-top: -16px;
|
|
||||||
top: 50%;
|
|
||||||
}
|
|
||||||
.tourbus-arrow-bottom:before {
|
|
||||||
border-bottom-color: #e5e5e5;
|
|
||||||
margin-left: -16px;
|
|
||||||
left: 50%;
|
|
||||||
}
|
|
||||||
.tourbus-arrow-top:before {
|
|
||||||
border-top-color: #e5e5e5;
|
|
||||||
margin-left: -16px;
|
|
||||||
left: 50%;
|
|
||||||
}
|
|
||||||
/* you shouldn't need to change these */
|
|
||||||
.tourbus-arrow-right:after,
|
|
||||||
.tourbus-arrow-right:before {
|
|
||||||
right: 100%;
|
|
||||||
}
|
|
||||||
.tourbus-arrow-left:after,
|
|
||||||
.tourbus-arrow-left:before {
|
|
||||||
left: 100%;
|
|
||||||
}
|
|
||||||
.tourbus-arrow-bottom:after,
|
|
||||||
.tourbus-arrow-bottom:before {
|
|
||||||
bottom: 100%;
|
|
||||||
}
|
|
||||||
.tourbus-arrow-top:after,
|
|
||||||
.tourbus-arrow-top:before {
|
|
||||||
top: 100%;
|
|
||||||
}
|
|
||||||
@ -29,11 +29,7 @@
|
|||||||
CENTER
|
CENTER
|
||||||
*/
|
*/
|
||||||
#centerpanel {
|
#centerpanel {
|
||||||
#buttonGroupVerticalShapes {
|
|
||||||
#btnConv, #btnDiv, #btnSine, #btnStraight {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
RIGHT
|
RIGHT
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
/*! normalize.css v1.0.2 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,nav,section,summary{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}html,button,input,select,textarea{font-family:sans-serif}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}h2{font-size:1.5em;margin:.83em 0}h3{font-size:1.17em;margin:1em 0}h4{font-size:1em;margin:1.33em 0}h5{font-size:.83em;margin:1.67em 0}h6{font-size:.67em;margin:2.33em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}blockquote{margin:1em 40px}dfn{font-style:italic}mark{background:#ff0;color:#000}p,pre{margin:1em 0}code,kbd,pre,samp{font-family:monospace,serif;_font-family:'courier new',monospace;font-size:1em}pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word}q{quotes:none}q:before,q:after{content:'';content:none}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dl,menu,ol,ul{margin:1em 0}dd{margin:0 0 0 40px}menu,ol,ul{padding:0 0 0 40px}nav ul,nav ol{list-style:none;list-style-image:none}img{border:0;-ms-interpolation-mode:bicubic}svg:not(:root){overflow:hidden}figure{margin:0}form{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0;white-space:normal;*margin-left:-7px}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer;*overflow:visible}button[disabled],input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0;*height:13px;*width:13px}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}
|
|
||||||
@ -1,5 +1,4 @@
|
|||||||
// IMPORTS
|
// IMPORTS
|
||||||
//@import "normalize.min.less";
|
|
||||||
//@import "jquery-tourbus.less";
|
//@import "jquery-tourbus.less";
|
||||||
@import "help_joyride-2.1.less";
|
@import "help_joyride-2.1.less";
|
||||||
@import "help.less";
|
@import "help.less";
|
||||||
@ -16,12 +15,6 @@
|
|||||||
@import "mobile.less";
|
@import "mobile.less";
|
||||||
}
|
}
|
||||||
|
|
||||||
// FULL
|
|
||||||
@media only screen and (min-width: 1000px) and (max-device-pixel-ratio : 1.5),
|
|
||||||
only screen and (min-width: 1000px) and (-webkit-max-device-pixel-ratio : 1.5) {
|
|
||||||
// @import "full.less";
|
|
||||||
}
|
|
||||||
|
|
||||||
// PORTRAIT
|
// PORTRAIT
|
||||||
@media only screen and (orientation:portrait) {
|
@media only screen and (orientation:portrait) {
|
||||||
@import "portrait.less";
|
@import "portrait.less";
|
||||||
|
|||||||
@ -1,22 +0,0 @@
|
|||||||
// #verticalShapes {
|
|
||||||
// position:absolute;
|
|
||||||
// right: 0;
|
|
||||||
// bottom: 15px;
|
|
||||||
// margin-right: -8.5%;
|
|
||||||
// width: 8%;
|
|
||||||
|
|
||||||
// >div {
|
|
||||||
// border: 2px solid #333;
|
|
||||||
// border-radius: 0px 5px 5px 0px;
|
|
||||||
// margin-top: 4px;
|
|
||||||
// background-color: #fff;
|
|
||||||
// cursor: pointer;
|
|
||||||
|
|
||||||
// img.verticalshape {
|
|
||||||
// width: 100%;
|
|
||||||
// max-width: 50px;
|
|
||||||
// height: auto;
|
|
||||||
// vertical-align: bottom;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
Loading…
Reference in New Issue
Block a user