fix: スタイル関係

* ナムルソン * word-break
nzws · Sep 7, 2018 · e11144d · e11144d
1 parent 8336617
commit e11144d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 40 deletions.
diff --git a/www/css/custom-size.css b/www/css/custom-size.css
@@ -17,3 +17,14 @@
 .toot_flex {
   display: flex;
 }
+
+ons-icon.namu {
+  position: absolute;
+  right: -30px;
+  top: 10px;
+  font-size: 3em !important;
+}
+
+.toot-card-right.namu {
+  width: calc(100% - 110px);
+}
diff --git a/www/css/style.css b/www/css/style.css
@@ -93,10 +93,6 @@ body {
   margin-right: 0;
 }
 
-.toot-button.namu-fav {
-  margin-right: 5px !important;
-}
-
 .toot-card-right {
   margin-left: 10px;
   margin-right: 5px;
@@ -105,21 +101,10 @@ body {
   flex-direction: column;
 }
 
-.namu-fav {
-  font-size: xx-large;
-  position: absolute;
-  top: 30px;
-  right: 10px;
-}
-
 .col-xs-9 {
   width: 80%;
 }
 
-.namu-toot {
-  margin-right: 30px;
-}
-
 .fav-active {
   color: #ca8f04 !important;
 }
@@ -712,8 +697,7 @@ img.emoji {
 .toot_content * {
   -webkit-user-select: auto;
   user-select: text;
-  word-wrap: break-word;
-  word-break: break-all;
+  word-break: break-word;
 }
 
 .close_button {

diff --git a/www/index.html b/www/index.html
@@ -2367,21 +2367,18 @@ <h3 id="qr-userid"></h3>
             <img src="<%=toot['account'][getConfig(1, 'no_gif') ? 'avatar_static' : 'avatar']%>" class="icon-img" onclick="show_account('<%=toot['account']['id']%>')">
           </div>
         <% } %>
-        <div class="toot-card-right<%=is_col%>">
-          <div class="<%=namucard%>">
-            <div class="toot-group name_box">
-              <% if (!no_icon) { %>
-                <div onclick="show_account('<%=toot['account']['id']%>')" class="toot_name">
-                  <b><%=toot['account']['display_name']%></b> <small>@<%=toot['account']['acct']%></small>
-                </div>
-              <% } %>
-            </div>
-            <div class="toot_content tootcontent_<%=toot['id']%><%=no_icon%>" data-id="<%=toot['id']%>" data-dispmode="<%=display_mode%>">
-              <p>
-                <%=toot['content']%>
-              </p>
-
-            </div>
+        <div class="toot-card-right<%=is_col%> <%=namu%>">
+          <div class="toot-group name_box">
+            <% if (!no_icon) { %>
+              <div onclick="show_account('<%=toot['account']['id']%>')" class="toot_name">
+                <b><%=toot['account']['display_name']%></b> <small>@<%=toot['account']['acct']%></small>
+              </div>
+            <% } %>
+          </div>
+          <div class="toot_content tootcontent_<%=toot['id']%><%=no_icon%>" data-id="<%=toot['id']%>" data-dispmode="<%=display_mode%>">
+            <p>
+              <%=toot['content']%>
+            </p>
           </div>
           <% if (display_mode === 'full') { %>
             <div class="<%=(is_col ? 'disable ' : '')%>toot-group tb_group_<%=toot['id']%>">
@@ -2392,7 +2389,7 @@ <h3 id="qr-userid"></h3>
                 <% } else { %>
                   <ons-icon icon="fa-retweet" onclick="toot_action(1)" class="tootbs_<%=toot['id']%> toot-button ons-icon fa-retweet fa<%=boosted%>" data-id="<%=toot['id']%>"></ons-icon>
                 <% } %>
-                <ons-icon icon="fa-star" onclick="toot_action(0)" class="tootfav_<%=toot['id']%> toot-button ons-icon fa-star fa<%=faved%>" data-id="<%=toot['id']%>"></ons-icon>
+                <ons-icon icon="fa-star" onclick="toot_action(0)" class="tootfav_<%=toot['id']%> toot-button ons-icon fa-star fa<%=faved%> <%=namu%>" data-id="<%=toot['id']%>"></ons-icon>
                 <ons-icon icon="fa-ellipsis-h" onclick="more('<%=toot['id']%>')" class="toot-button toot-button-last ons-icon fa-ellipsis-h fa"></ons-icon>
               </div>
               <div class="toot-right date date-disp" data-time="<%=toot['created_at']%>" onclick="show_post('<%=toot['id']%>')">

diff --git a/www/js/toot.js b/www/js/toot.js
@@ -1,6 +1,5 @@
 function toot_card(toot, mode, note, toot_light, page) {
   var piccard = '',
-    namucard = '',
     p = 0,
     alert_text = '',
     content = '';
@@ -71,11 +70,6 @@ function toot_card(toot, mode, note, toot_light, page) {
       BoxData['vote'] = vote;
     }
   }
-
-  if (getConfig(1, 'bigfav') == 1 && mode != 'big') {
-    namucard = ' namu-toot';
-    namubt = ' namu-fav';
-  }
   BoxData['toot_base_classes'] = '';
   if (toot_light === 'gold') BoxData['toot_base_classes'] += ' toot_gold';
   if (toot_light === 'light') BoxData['toot_base_classes'] += ' toot_light';
@@ -269,7 +263,7 @@ function toot_card(toot, mode, note, toot_light, page) {
   BoxData['bgstyle'] = col_bg_st;
   BoxData['alert_text'] = alert_text;
   BoxData['no_icon'] = page === 'alert' && note && getConfig(2, 'alert_m') ? ' no_icon' : '';
-  BoxData['namucard'] = namucard;
+  BoxData['namu'] = getConfig(1, 'bigfav') ? 'namu' : '';
   BoxData['is_col'] = is_col;
   BoxData['visibility_icon'] = visibility_icon;
   BoxData['display_mode'] = mode;