diff --git a/app/assets/stylesheets/main.sass b/app/assets/stylesheets/main.sass index f820206..6262bf3 100644 --- a/app/assets/stylesheets/main.sass +++ b/app/assets/stylesheets/main.sass @@ -110,11 +110,26 @@ a margin-top: 5px margin-right: 5px .thought + overflow: hidden border: none margin-top: -10px font-size: $size-medium word-wrap: break-word padding: 5px 5px 23px 5px + height: 83px +.thought-bottom-section-standard + background-color: #000 + border-bottom-left-radius: 5px + border-bottom-right-radius: 5px + height: 24px + bottom: 0px +.thought-bottom-section-overlay + @extend .thought-bottom-section-standard + border-radius: 0px + position: absolute + width: 100% + height: 37px + bottom: 0px .thought-controls position: absolute bottom: 3px diff --git a/app/views/thoughts/_bottom_section_overlay.haml b/app/views/thoughts/_bottom_section_overlay.haml index b29d4d2..0a0131d 100644 --- a/app/views/thoughts/_bottom_section_overlay.haml +++ b/app/views/thoughts/_bottom_section_overlay.haml @@ -1,2 +1,3 @@ -=render :partial => "thoughts/votes_overlay", :locals => {thought: thought} -=render :partial => "thoughts/controls_overlay", :locals => {thought: thought} +.thought-bottom-section-overlay + =render :partial => "thoughts/votes_overlay", :locals => {thought: thought} + =render :partial => "thoughts/controls_overlay", :locals => {thought: thought} diff --git a/app/views/thoughts/_bottom_section_standard.haml b/app/views/thoughts/_bottom_section_standard.haml index f59dc73..f0e5de4 100644 --- a/app/views/thoughts/_bottom_section_standard.haml +++ b/app/views/thoughts/_bottom_section_standard.haml @@ -1,2 +1,3 @@ -=render :partial => "thoughts/votes_standard", :locals => {thought: thought} -=render :partial => "thoughts/controls_standard", :locals => {thought: thought} +.thought-bottom-section-standard + =render :partial => "thoughts/votes_standard", :locals => {thought: thought} + =render :partial => "thoughts/controls_standard", :locals => {thought: thought} diff --git a/app/views/thoughts/_thought_box.haml b/app/views/thoughts/_thought_box.haml index 7d9042f..83dec16 100644 --- a/app/views/thoughts/_thought_box.haml +++ b/app/views/thoughts/_thought_box.haml @@ -1,5 +1,5 @@ -is_new_thought ||= nil .thought-box{class: custom_styles(thought, is_new_thought), id: "thought-box-#{thought.id}"} .thought - =simple_format(auto_link(truncate(thought.text, length: 99, :omission => ' ...'))) + =simple_format(auto_link(thought.text)) =render :partial => "thoughts/bottom_section_standard", :locals => {thought: thought} \ No newline at end of file diff --git a/public/assets/application-42efb240b4740cbe772faeab8c9561cc.js.gz b/public/assets/application-42efb240b4740cbe772faeab8c9561cc.js.gz index 2f9ed66..3d852de 100644 Binary files a/public/assets/application-42efb240b4740cbe772faeab8c9561cc.js.gz and b/public/assets/application-42efb240b4740cbe772faeab8c9561cc.js.gz differ diff --git a/public/assets/application-f908da3a7d7f6c2d927014e543b364c1.css b/public/assets/application-eb8a37afd06b7a5142e455637662ccc4.css similarity index 51% rename from public/assets/application-f908da3a7d7f6c2d927014e543b364c1.css rename to public/assets/application-eb8a37afd06b7a5142e455637662ccc4.css index 224b8cc..275d520 100644 --- a/public/assets/application-f908da3a7d7f6c2d927014e543b364c1.css +++ b/public/assets/application-eb8a37afd06b7a5142e455637662ccc4.css @@ -1 +1 @@ -@font-face{font-family:PTMono;src:url(/assets/PTM55FT.ttf)}.size-big{font-size:26px}.size-medium{font-size:14px}.size-small{font-size:12px}.hidden{display:none}pre{font-size:12px}body{position:relative;color:#ebebeb;font-family:PTMono,sans-serif;background-color:#1b1b1b;background-image:url("brain-dark.jpg");background-position:top center;background-repeat:no-repeat}a{color:#ff9729;text-decoration:none}a:hover{color:#e3cf57}#nav-bar{position:relative;height:25px;border-bottom:1px solid}#nav-bar #nav-links{position:absolute;left:20px}#nav-bar #recent-thought-walls{border:solid 1px #ebebeb;background-color:#1b1b1b;opacity:0;position:absolute;left:20px;top:25px;padding:10px;z-index:10}#content{position:absolute;left:20px;top:60px;width:98%;height:300px}#overlay{display:none;opacity:0;position:fixed;top:0px;left:0px;width:100%;height:100%;background-color:#1b1b1b}#overlay-close{background-color:#1b1b1b;border-color:#ebebeb;font-size:26px;border:1px solid;width:100%;height:25px;text-align:center}#overlay-content{width:100%;height:100%}.collaboration-div{position:absolute;width:30%;right:0px}.thought-box-overlay-background{background-color:#1b1b1b;width:100%;height:100%}.thought-box-overlay{width:100%;height:100%;overflow:auto}.thought-box,#thought-form{width:215px;height:125px;float:left;position:relative;border:1px solid #424242;border-radius:5px;margin-top:5px;margin-right:5px}.thought{border:none;margin-top:-10px;font-size:14px;word-wrap:break-word;padding:5px 5px 23px 5px}.thought-controls{position:absolute;bottom:3px;right:5px}.thought-votes{position:absolute;bottom:3px;left:5px}#thought-wall-form{width:70%;position:relative}#update_thought_wall_spinner{display:none;position:absolute;top:0px;right:20px}#thought-form{height:257px}.new-thought-box{opacity:0;width:0px}#thought-new-remaining-characters{float:left}.positive{background:rgba(128,255,128,0.1)}.negative{background:rgba(130,32,32,0.2)}input,#thought-form textarea,#thought-edit textarea{color:#ebebeb;background-color:#1b1b1b;border:none}#thought-form textarea{background-color:#222;font-family:PTMono,sans-serif;width:210px;height:225px}#thought-edit textarea{background-color:#222;font-family:PTMono,sans-serif;width:210px;height:95px}.thought-add-button{float:right}.title-entry{font-size:26px;width:95%} +@font-face{font-family:PTMono;src:url(/assets/PTM55FT.ttf)}.size-big{font-size:26px}.size-medium{font-size:14px}.size-small{font-size:12px}.hidden{display:none}pre{font-size:12px}body{position:relative;color:#ebebeb;font-family:PTMono,sans-serif;background-color:#1b1b1b;background-image:url("brain-dark.jpg");background-position:top center;background-repeat:no-repeat}a{color:#ff9729;text-decoration:none}a:hover{color:#e3cf57}#nav-bar{position:relative;height:25px;border-bottom:1px solid}#nav-bar #nav-links{position:absolute;left:20px}#nav-bar #recent-thought-walls{border:solid 1px #ebebeb;background-color:#1b1b1b;opacity:0;position:absolute;left:20px;top:25px;padding:10px;z-index:10}#content{position:absolute;left:20px;top:60px;width:98%;height:300px}#overlay{display:none;opacity:0;position:fixed;top:0px;left:0px;width:100%;height:100%;background-color:#1b1b1b}#overlay-close{background-color:#1b1b1b;border-color:#ebebeb;font-size:26px;border:1px solid;width:100%;height:25px;text-align:center}#overlay-content{width:100%;height:100%}.collaboration-div{position:absolute;width:30%;right:0px}.thought-box-overlay-background{background-color:#1b1b1b;width:100%;height:100%}.thought-box-overlay{width:100%;height:100%;overflow:auto}.thought-box,#thought-form{width:215px;height:125px;float:left;position:relative;border:1px solid #424242;border-radius:5px;margin-top:5px;margin-right:5px}.thought{overflow:hidden;border:none;margin-top:-10px;font-size:14px;word-wrap:break-word;padding:5px 5px 23px 5px;height:83px}.thought-bottom-section-standard,.thought-bottom-section-overlay{background-color:#000;border-bottom-left-radius:5px;border-bottom-right-radius:5px;height:24px;bottom:0px}.thought-bottom-section-overlay{border-radius:0px;position:absolute;width:100%;height:37px;bottom:0px}.thought-controls{position:absolute;bottom:3px;right:5px}.thought-votes{position:absolute;bottom:3px;left:5px}#thought-wall-form{width:70%;position:relative}#update_thought_wall_spinner{display:none;position:absolute;top:0px;right:20px}#thought-form{height:257px}.new-thought-box{opacity:0;width:0px}#thought-new-remaining-characters{float:left}.positive{background:rgba(128,255,128,0.1)}.negative{background:rgba(130,32,32,0.2)}input,#thought-form textarea,#thought-edit textarea{color:#ebebeb;background-color:#1b1b1b;border:none}#thought-form textarea{background-color:#222;font-family:PTMono,sans-serif;width:210px;height:225px}#thought-edit textarea{background-color:#222;font-family:PTMono,sans-serif;width:210px;height:95px}.thought-add-button{float:right}.title-entry{font-size:26px;width:95%} diff --git a/public/assets/application-eb8a37afd06b7a5142e455637662ccc4.css.gz b/public/assets/application-eb8a37afd06b7a5142e455637662ccc4.css.gz new file mode 100644 index 0000000..287baa6 Binary files /dev/null and b/public/assets/application-eb8a37afd06b7a5142e455637662ccc4.css.gz differ diff --git a/public/assets/application-f908da3a7d7f6c2d927014e543b364c1.css.gz b/public/assets/application-f908da3a7d7f6c2d927014e543b364c1.css.gz deleted file mode 100644 index 26cae59..0000000 Binary files a/public/assets/application-f908da3a7d7f6c2d927014e543b364c1.css.gz and /dev/null differ diff --git a/public/assets/application.css b/public/assets/application.css index 224b8cc..275d520 100644 --- a/public/assets/application.css +++ b/public/assets/application.css @@ -1 +1 @@ -@font-face{font-family:PTMono;src:url(/assets/PTM55FT.ttf)}.size-big{font-size:26px}.size-medium{font-size:14px}.size-small{font-size:12px}.hidden{display:none}pre{font-size:12px}body{position:relative;color:#ebebeb;font-family:PTMono,sans-serif;background-color:#1b1b1b;background-image:url("brain-dark.jpg");background-position:top center;background-repeat:no-repeat}a{color:#ff9729;text-decoration:none}a:hover{color:#e3cf57}#nav-bar{position:relative;height:25px;border-bottom:1px solid}#nav-bar #nav-links{position:absolute;left:20px}#nav-bar #recent-thought-walls{border:solid 1px #ebebeb;background-color:#1b1b1b;opacity:0;position:absolute;left:20px;top:25px;padding:10px;z-index:10}#content{position:absolute;left:20px;top:60px;width:98%;height:300px}#overlay{display:none;opacity:0;position:fixed;top:0px;left:0px;width:100%;height:100%;background-color:#1b1b1b}#overlay-close{background-color:#1b1b1b;border-color:#ebebeb;font-size:26px;border:1px solid;width:100%;height:25px;text-align:center}#overlay-content{width:100%;height:100%}.collaboration-div{position:absolute;width:30%;right:0px}.thought-box-overlay-background{background-color:#1b1b1b;width:100%;height:100%}.thought-box-overlay{width:100%;height:100%;overflow:auto}.thought-box,#thought-form{width:215px;height:125px;float:left;position:relative;border:1px solid #424242;border-radius:5px;margin-top:5px;margin-right:5px}.thought{border:none;margin-top:-10px;font-size:14px;word-wrap:break-word;padding:5px 5px 23px 5px}.thought-controls{position:absolute;bottom:3px;right:5px}.thought-votes{position:absolute;bottom:3px;left:5px}#thought-wall-form{width:70%;position:relative}#update_thought_wall_spinner{display:none;position:absolute;top:0px;right:20px}#thought-form{height:257px}.new-thought-box{opacity:0;width:0px}#thought-new-remaining-characters{float:left}.positive{background:rgba(128,255,128,0.1)}.negative{background:rgba(130,32,32,0.2)}input,#thought-form textarea,#thought-edit textarea{color:#ebebeb;background-color:#1b1b1b;border:none}#thought-form textarea{background-color:#222;font-family:PTMono,sans-serif;width:210px;height:225px}#thought-edit textarea{background-color:#222;font-family:PTMono,sans-serif;width:210px;height:95px}.thought-add-button{float:right}.title-entry{font-size:26px;width:95%} +@font-face{font-family:PTMono;src:url(/assets/PTM55FT.ttf)}.size-big{font-size:26px}.size-medium{font-size:14px}.size-small{font-size:12px}.hidden{display:none}pre{font-size:12px}body{position:relative;color:#ebebeb;font-family:PTMono,sans-serif;background-color:#1b1b1b;background-image:url("brain-dark.jpg");background-position:top center;background-repeat:no-repeat}a{color:#ff9729;text-decoration:none}a:hover{color:#e3cf57}#nav-bar{position:relative;height:25px;border-bottom:1px solid}#nav-bar #nav-links{position:absolute;left:20px}#nav-bar #recent-thought-walls{border:solid 1px #ebebeb;background-color:#1b1b1b;opacity:0;position:absolute;left:20px;top:25px;padding:10px;z-index:10}#content{position:absolute;left:20px;top:60px;width:98%;height:300px}#overlay{display:none;opacity:0;position:fixed;top:0px;left:0px;width:100%;height:100%;background-color:#1b1b1b}#overlay-close{background-color:#1b1b1b;border-color:#ebebeb;font-size:26px;border:1px solid;width:100%;height:25px;text-align:center}#overlay-content{width:100%;height:100%}.collaboration-div{position:absolute;width:30%;right:0px}.thought-box-overlay-background{background-color:#1b1b1b;width:100%;height:100%}.thought-box-overlay{width:100%;height:100%;overflow:auto}.thought-box,#thought-form{width:215px;height:125px;float:left;position:relative;border:1px solid #424242;border-radius:5px;margin-top:5px;margin-right:5px}.thought{overflow:hidden;border:none;margin-top:-10px;font-size:14px;word-wrap:break-word;padding:5px 5px 23px 5px;height:83px}.thought-bottom-section-standard,.thought-bottom-section-overlay{background-color:#000;border-bottom-left-radius:5px;border-bottom-right-radius:5px;height:24px;bottom:0px}.thought-bottom-section-overlay{border-radius:0px;position:absolute;width:100%;height:37px;bottom:0px}.thought-controls{position:absolute;bottom:3px;right:5px}.thought-votes{position:absolute;bottom:3px;left:5px}#thought-wall-form{width:70%;position:relative}#update_thought_wall_spinner{display:none;position:absolute;top:0px;right:20px}#thought-form{height:257px}.new-thought-box{opacity:0;width:0px}#thought-new-remaining-characters{float:left}.positive{background:rgba(128,255,128,0.1)}.negative{background:rgba(130,32,32,0.2)}input,#thought-form textarea,#thought-edit textarea{color:#ebebeb;background-color:#1b1b1b;border:none}#thought-form textarea{background-color:#222;font-family:PTMono,sans-serif;width:210px;height:225px}#thought-edit textarea{background-color:#222;font-family:PTMono,sans-serif;width:210px;height:95px}.thought-add-button{float:right}.title-entry{font-size:26px;width:95%} diff --git a/public/assets/application.css.gz b/public/assets/application.css.gz index bb6e594..a2aa3a7 100644 Binary files a/public/assets/application.css.gz and b/public/assets/application.css.gz differ diff --git a/public/assets/application.js.gz b/public/assets/application.js.gz index 6d1fe97..90c3172 100644 Binary files a/public/assets/application.js.gz and b/public/assets/application.js.gz differ diff --git a/public/assets/manifest.yml b/public/assets/manifest.yml index 8eb55cb..5289e1f 100644 --- a/public/assets/manifest.yml +++ b/public/assets/manifest.yml @@ -4,4 +4,4 @@ brain-light.jpg: brain-light-561b24be085e75f3378e031c64251277.jpg spinner.gif: spinner-6aa1008d858cbed1cd320422f59a4789.gif application.js: application-42efb240b4740cbe772faeab8c9561cc.js PTM55FT.ttf: PTM55FT-7515d9db13e596569dc717ef3606ce98.ttf -application.css: application-f908da3a7d7f6c2d927014e543b364c1.css +application.css: application-eb8a37afd06b7a5142e455637662ccc4.css