Skip to content

Commit

Permalink
Optimize and cleanup css.
Browse files Browse the repository at this point in the history
Now only used css rules exist, assuming a whiteboard contains elements for each rule in reset.css, with all tools, dialogs, chat message types and progress indicator visible and using edit tool while clicking compass ;)
  • Loading branch information
msand committed Mar 2, 2017
1 parent 2cdc952 commit f7614a3
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 313 deletions.
2 changes: 1 addition & 1 deletion client/code/app/toolbar/chat.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ function userCreator(map, name) {
}
var div = document.createElement("div");
div.textContent = name;
div.class = "userItem";
div.className = "userItem";
var user = map.users[name] = { name: name, div: div };
div.onclick = function() {
if (user.pos) {
Expand Down
2 changes: 1 addition & 1 deletion client/css/chat.css
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
color: green
}

#chatlogs .sent {
#chatLogs .sent {
padding-right: 10px;
display: inline-block;
float: right
Expand Down
91 changes: 0 additions & 91 deletions client/css/libs/animation.css

This file was deleted.

44 changes: 1 addition & 43 deletions client/css/libs/nprogress.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#nprogress .peg {
display: block;
position: absolute;
right: 0px;
right: 0;
width: 100px;
height: 100%;
box-shadow: 0 0 10px #29d, 0 0 5px #29d;
Expand All @@ -29,45 +29,3 @@
-ms-transform: rotate(3deg) translate(0px, -4px);
transform: rotate(3deg) translate(0px, -4px);
}

/* Remove these to get rid of the spinner */
#nprogress .spinner {
display: block;
position: fixed;
z-index: 1031;
top: 15px;
right: 15px;
}

#nprogress .spinner-icon {
width: 18px;
height: 18px;
box-sizing: border-box;

border: solid 2px transparent;
border-top-color: #29d;
border-left-color: #29d;
border-radius: 50%;

-webkit-animation: nprogress-spinner 400ms linear infinite;
animation: nprogress-spinner 400ms linear infinite;
}

.nprogress-custom-parent {
overflow: hidden;
position: relative;
}

.nprogress-custom-parent #nprogress .spinner,
.nprogress-custom-parent #nprogress .bar {
position: absolute;
}

@-webkit-keyframes nprogress-spinner {
0% { -webkit-transform: rotate(0deg); }
100% { -webkit-transform: rotate(360deg); }
}
@keyframes nprogress-spinner {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
5 changes: 0 additions & 5 deletions client/css/toolbar/login.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
font-size: 15px
}

.loginIcon.iconHover,.open .loginIcon {
color: #07f;
-webkit-text-stroke: 1px #9b9b9b
}

#loginDiv,.clearButton {
margin: 0;
padding: 0
Expand Down
6 changes: 0 additions & 6 deletions client/css/toolbar/pencil.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@
color: #000
}

.farbtastic {
height: 100px;
width: 100px;
left: 0
}

#pencilStrokeWidth {
margin-top: 30px
}
Expand Down
42 changes: 34 additions & 8 deletions client/css/toolbar/permissions.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,37 @@
.userPermissionModal {
width: 300px;
margin: 30px auto;
position: relative;
font-family: 'Helvetica',Helvetica,Arial,sans-serif
#sharingSettingsDialog {
padding: 10px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
background-color: #fff;
box-shadow: 1px 0 15px 0 rgba(50,50,50,.5);
border: 1px solid #bdbdbd;
position: absolute;
width: 421px;
top: 50vh;
left: 50vw;
}

.userPermissionModal td,.userPermissionModal th {
margin: 3px;
padding: 3px
#shareLinkURL {
width: 92%;
max-width: 92%;
}

.aclUsername {
font-family: helvetica,serif;
min-width: 210px;
display: inline-block;
font-size: 14px
}

#aclUsernameField {
width: 205px;
}

#closeAclDialogButton {
float: right;
}

.anyoneRule, .linkDescription {
margin-bottom: 30px;
}
3 changes: 2 additions & 1 deletion client/css/toolbar/text.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.dottedHr {
border: 1px dotted;
color: #ccc
color: #ccc;
width: 100%
}

#textPreviewWrapper {
Expand Down
23 changes: 2 additions & 21 deletions client/css/toolbar/timeline.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,14 @@
padding: 12px 12px 8px
}

.timelineButton,.timemachineButton1,.timemachineButton2 {
.timemachineButton1 {
border: none;
background: 0 0;
font-size: 20px;
color: #3d3d3d
}

.timemachineButton2 {
padding: 12px 12px 10px
}

.timelineButton:hover,.timemachineButton1:hover,.timemachineButton2:hover {
.timemachineButton1:hover {
color: #000
}

Expand Down Expand Up @@ -49,19 +45,4 @@

#now {
padding-bottom: 5px
}

.timelineButton {
display: block;
margin: 0 0 2px 9px
}

#firstkeyButton {
margin-top: 2px
}

.keyframetext {
font-size: 12px;
color: #666;
margin-top: -2px
}
5 changes: 0 additions & 5 deletions client/css/toolbar/toolbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@
padding-bottom: 5px
}

.toolBar.open {
border-top: 1px solid #fff;
margin-bottom: 10px
}

.toolBar .open {
border-bottom: 1px solid #d8d8d8;
background: #fff
Expand Down
Loading

0 comments on commit f7614a3

Please sign in to comment.