Merge branch 'master' of https://codefirst.iut.uca.fr/git/nathan.boileau/Scripted

2 years ago · a7e6a152f7
parent 00257a2ba4 e27634c37a
commit a7e6a152f7
3 changed files with 35 additions and 9 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -10,4 +10,18 @@ steps:
  image: node
  commands:
  - npm install
-  # - find -name "*.js"| grep -v "node_modules" | xargs node -c
+
+- name: deploy
+  image: appleboy/drone-scp 
+  settings:
+    port: 22
+    host: sancy.iut.uca.fr
+    username: lafourcade
+    target: public_html/Scripted
+    source: WEB/*
+    key:
+      from_secret: DEPLOY_KEY
+    secrets: 
+    - source: DEPLOY_KEY 
+    target: scp_key
+    rm: true
--- a/WEB/View/src/CSS/Enigmev2.css
+++ b/WEB/View/src/CSS/Enigmev2.css
@ -9,11 +9,8 @@
 /*Ace CSS */

 .ace{
-    width: 45%;
-    height: 90%;
-    max-height: 100%;
-    margin-bottom: 0;
-    margin-right: 10px;
+    width: 100%;
+    height: 100%;
 }


@ -213,3 +210,18 @@
  {
      background: linear-gradient(45deg, #d400d4, #0e1538, #fb5942);
  }
+
+  /* Console CSS*/
+
+#console{
+  font-size: .8rem;
+  opacity: 0.85;
+  letter-spacing: 1px;
+  background-color: #040a29;
+  color: #fff;
+  border: solid 1px #414141;
+  max-width: 95%;
+  max-height: 85%;
+  line-height: 1.5;
+  resize: none;
+}
--- a/WEB/View/src/pages/Enigme/Enigmebootstrap.html
+++ b/WEB/View/src/pages/Enigme/Enigmebootstrap.html
@ -23,7 +23,7 @@
        crossorigin="anonymous"></script>
    </head>
    <body style="background-color: black;background-image: none;">
-        <div class="container-fluid mx-4">
+        <div class="container-fluid">
            <div class="row">
                <div class="col-3">
                    <div class="retour">
@ -60,7 +60,7 @@ print(estPalindrome("abba"))
                </div>
                <div class="col-4">
                    <div class='compiler_class'>
-                        <textarea id='console' readonly></textarea>
+                        <textarea id='console' readonly cols="100" rows="30"></textarea>
                    </div>
                    <div class="buttons">
                        <div>