Merge branch 'develop'

BlitzModder · Apr 13, 2017 · 9ab299d · 9ab299d
2 parents 958c8ac + 8df14e3
commit 9ab299d
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 117 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "BlitzModder",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Mod manager for World of Tanks Blitz(PC)",
   "main": "bin/core/core.js",
   "scripts": {
@@ -22,7 +22,7 @@
   "homepage": "https://github.com/BlitzModder/BMPC/wiki",
   "license": "MIT",
   "dependencies": {
-    "bootstrap": "^4.0.0-alpha.5",
+    "bootstrap": "^4.0.0-alpha.6",
     "fs-extra": "^2.1.2",
     "fstream": "^1.0.11",
     "jszip": "^3.1.3",

diff --git a/src/gui/css/core.scss b/src/gui/css/core.scss
@@ -1,20 +1,24 @@
-body {
-  padding-top: 5rem;
-}
-
 * {
   user-select: none;
 }
 .user-select {
   user-select: text;
 }
+.navbar {
+  flex-direction: row;
+}
+.card-block {
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
 
+.category {
+  width: 100%;
+}
 button.applied::after {
   content: "インストール済";
   color: blue;
-}
-.form-check {
-  margin-bottom: 0;
+  margin-left: 20px;
 }
 webview {
   height: 100%;
@@ -23,25 +27,6 @@ webview {
   height: 450px;
 }
 
-.with-form {
-  margin-bottom: 10px;
-}
-
-#remoteRepoInput {
-  margin-top: 5px;
-  margin-right: 5px;
-}
-.remoteRepoButton {
-  margin-top: 5px;
-}
-#debugRepo, #blitzFolder {
-  padding: 10px;
-}
-
-.remove {
-  float: right;
-}
-
 #applyInfo textarea {
   width: 100%;
   height: 300px;
@@ -98,7 +83,7 @@ li {
   transform: rotate(45deg);
   border-right: 3px solid #0275d8;
   border-bottom: 3px solid #0275d8;
-  top: calc(50% - (35px/12));
+  top: (35px/6);
   display: block;
   margin-top: (-35px/6);
   width: (35px/6);
@@ -182,6 +167,7 @@ label {
       @include bacontent();
       @include rc();
       border-radius: 100%;
+      top: 3px;
       left: 0px;
       z-index: 3;
     }

diff --git a/src/gui/index.haml b/src/gui/index.haml
@@ -7,34 +7,32 @@
     %link(rel="stylesheet" type="text/css" href="../node_modules/bootstrap/dist/css/bootstrap.min.css")
     %link(rel="stylesheet" type="text/css" href="css/core.css")
   %body
-    .pos-f-t
-      %nav.navbar.navbar-dark.navbar-static-top.bg-faded
-        %form.form-inline.float-xs-left
-          %a(href="./setting.html")
-            %button.btn(type="button")
-              %img(src="./img/cogs.svg" height="30px" width="30px")
-        %form.form-inline.float-xs-right
-          %button.btn#play(type="button")
-            %img(src="./img/play3.svg" height="30px" width="30px")
+    %nav.navbar.navbar-dark.sticky-top.bg-faded.mb-4
+      .mr-auto
+        %a(href="./setting.html")
+          %button.btn(type="button")
+            %img(src="./img/cogs.svg" height="30px" width="30px")
+      %button.btn#play(type="button")
+        %img(src="./img/play3.svg" height="30px" width="30px")
     .container-fluid
       .row#repo
-        .col-xs(v-if="remoteRepos.length > 0")
+        .col-md-6(v-if="remoteRepos.length > 0")
           .card.card-block
             %h4.card-title
               %span.ja リモートリポジトリ
               %span.en Remote Repository
               %span.ru удаленном репозитории
             %ul.list-group
               %li(is="repo" v-for="r in remoteRepos" :name="r" repotype="remote")
-        .col-xs(v-if="localRepos.length > 0")
+        .col-md-6(v-if="localRepos.length > 0")
           .card.card-block
             %h4.card-title
               %span.ja ローカルリポジトリ
               %span.en Local Repository
               %span.ru Локальный репозиторий
             %ul.list-group
               %li(is="repo" v-for="r in localRepos" :name="r" repotype="local")
-        .col-xs(v-if="debugRepo !== \"\"")
+        .col-md-6(v-if="debugRepo !== \"\"")
           .card.card-block
             %h4.card-title
               %span.ja デバッグ用リポジトリ

diff --git a/src/gui/js/repo.coffee b/src/gui/js/repo.coffee
@@ -29,7 +29,7 @@ for l in langList when l isnt lang
 
 Vue.component("description",
   template: """
-            <div class="col-xs">
+            <div class="col-12">
               <div class="card card-outline-primary card-block">
                 <h4 class="card-title">{{name}}</h4>
                 <h6 class="card-subtitle text-muted">{{version}}</h4>
@@ -41,7 +41,7 @@ Vue.component("description",
 )
 Vue.component("big-category",
   template: """
-            <div class="col-xs">
+            <div class="col-md-6">
               <div class="card card-block">
                 <h4 class="card-title">{{name}}</h4>
                 <ul class="list-group">
@@ -54,9 +54,9 @@ Vue.component("big-category",
 )
 Vue.component("small-category",
   template: """
-            <li class="list-group-item">
+            <li class="list-group-item flex-column align-items-start">
               <a data-toggle="collapse" :href="id">{{name}}</a>
-              <div class="collapse" :id="idName">
+              <div class="category collapse" :id="idName">
                 <div class="list-group">
                   <button is="mod" type="button" v-for="(v, k) in val" :name="k" :val="v"></button>
                 </div>
@@ -73,8 +73,8 @@ Vue.component("small-category",
 firstExec = true
 Vue.component("mod",
   template: """
-            <button type="button" class="list-group-item list-group-item-action" :class="{applied: applied}" :data-path="val" @click="show">
-              <div class="form-check">
+            <button type="button" class="list-group-item list-group-item-action flex-column align-items-start" :class="{applied: applied}" :data-path="val" @click="show">
+              <div class="form-check mb-0">
                 <label class="form-check-label checkbox_text">
                   <input type="checkbox" class="form-check-input checkbox" :data-path="val" v-model="checked">
                   {{name}}

diff --git a/src/gui/js/setting.coffee b/src/gui/js/setting.coffee
@@ -63,7 +63,7 @@ formatRepoName = (name) ->
   return name
 
 Vue.component("repo",
-  template: "<li class=\"list-group-item\">{{formatedName}}<removeRepoButton @remove=\"removeRepo\"></li>"
+  template: "<li class=\"list-group-item\"><span class=\"mr-auto\">{{formatedName}}</span><removeRepoButton @remove=\"removeRepo\"></li>"
   props: ["name", "num", "repos"]
   computed:
     formatedName: ->
@@ -75,7 +75,7 @@ Vue.component("repo",
       return
 )
 Vue.component("debug-repo",
-  template: "<div class=\"card card-block\" id=\"debugRepo\">{{formatedName}}<removeRepoButton @remove=\"remove\"></div>"
+  template: "<div class=\"card card-block p-1\" id=\"debugRepo\"><span class=\"mr-auto\">{{formatedName}}</span><removeRepoButton @remove=\"remove\"></div>"
   props: ["name"]
   computed:
     formatedName: ->
@@ -88,14 +88,14 @@ Vue.component("debug-repo",
       return
 )
 Vue.component("blitz-path",
-  template: "<div class=\"card card-block\" id=\"blitzFolder\">{{formatedName}}</div>"
+  template: "<div class=\"card card-block p-1\" id=\"blitzFolder\">{{formatedName}}</div>"
   props: ["name"]
   computed:
     formatedName: ->
       return formatRepoName(@name)
 )
 Vue.component("removeRepoButton",
-  template: "<button type=\"button\" class=\"remove close\" @click=\"$emit('remove')\"><span>&times;</span></button>"
+  template: "<button type=\"button\" class=\"close\" @click=\"$emit('remove')\"><span>&times;</span></button>"
 )
 new Vue(
   el: "#setting"

diff --git a/src/gui/repo.haml b/src/gui/repo.haml
@@ -7,23 +7,21 @@
     %link(rel="stylesheet" type="text/css" href="../node_modules/bootstrap/dist/css/bootstrap.min.css")
     %link(rel="stylesheet" type="text/css" href="css/core.css")
   %body
-    .pos-f-t
-      %nav.navbar.navbar-dark.navbar-static-top.bg-faded
-        %form.form-inline.float-xs-left
-          %a(href="./index.html")
-            %button.btn(type="button")
-              %img(src="./img/circle-left.svg" height="30px" width="30px")
-        %form.form-inline.float-xs-right
-          %button.btn#reload(type="button")
-            %img(src="./img/loop2.svg" height="30px" width="30px")
-          %button.btn#apply(type="button")
-            %img(src="./img/checkmark2.svg" height="30px" width="30px")
+    %nav.navbar.navbar-dark.sticky-top.bg-faded.mb-4
+      .mr-auto
+        %a(href="./index.html")
+          %button.btn(type="button")
+            %img(src="./img/circle-left.svg" height="30px" width="30px")
+      %button.btn#reload(type="button")
+        %img(src="./img/loop2.svg" height="30px" width="30px")
+      %button.btn#apply(type="button")
+        %img(src="./img/checkmark2.svg" height="30px" width="30px")
     .container-fluid
       .row#root
         %description(v-if="hasinfo" :name="infoname" :version="infoversion" :maintainer="infomaintainer")
-        .col-xs.text-center(v-if="loading")
+        .col-12.text-center(v-if="loading")
           %img.spin(src="./img/spinner2.svg" height="40px" width="40px")
-        .col-xs(v-else-if="error")
+        .col-12(v-else-if="error")
           %p
             %span.ja エラーが発生しました
             %span.en Error has happen