Home Explore Help
Sign In
LInE
/
iVProg
2
0
Fork 1
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'fixintegrity' of LInE/ivprog into master

Lucas de Souza 6 years ago
parent
30f3ac95f7 fa242667f9
commit
db8605091c
10 changed files with 63 additions and 7 deletions
Split View Show Diff Stats
  1. BIN
      css/fonts/cyrillic-ext-roboto.woff2
  2. BIN
      css/fonts/cyrillic-roboto.woff2
  3. BIN
      css/fonts/greek-ext-roboto.woff2
  4. BIN
      css/fonts/greek-roboto.woff2
  5. BIN
      css/fonts/latin-ext-roboto.woff2
  6. BIN
      css/fonts/latin-roboto.woff2
  7. BIN
      css/fonts/vietnamese-roboto.woff2
  8. 56 0
      css/roboto.css
  9. 5 7
      templates/index.html
  10. 2 0
      webpack.config.js

BIN
css/fonts/cyrillic-ext-roboto.woff2
View File


BIN
css/fonts/cyrillic-roboto.woff2
View File


BIN
css/fonts/greek-ext-roboto.woff2
View File


BIN
css/fonts/greek-roboto.woff2
View File


BIN
css/fonts/latin-ext-roboto.woff2
View File


BIN
css/fonts/latin-roboto.woff2
View File


BIN
css/fonts/vietnamese-roboto.woff2
View File


+ 56 - 0
css/roboto.css
View File 

@@ -0,0 +1,56 @@
 
+/* cyrillic-ext */
 
+@font-face {
 
+  font-family: 'Roboto';
 
+  font-style: normal;
 
+  font-weight: 400;
 
+  src: local('Roboto'), local('Roboto-Regular'), url(fonts/cyrillic-ext-roboto.woff2) format('woff2');
 
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
 
+}
 
+/* cyrillic */
 
+@font-face {
 
+  font-family: 'Roboto';
 
+  font-style: normal;
 
+  font-weight: 400;
 
+  src: local('Roboto'), local('Roboto-Regular'), url(fonts/cyrillic-roboto.woff2) format('woff2');
 
+  unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 
+}
 
+/* greek-ext */
 
+@font-face {
 
+  font-family: 'Roboto';
 
+  font-style: normal;
 
+  font-weight: 400;
 
+  src: local('Roboto'), local('Roboto-Regular'), url(fonts/greek-ext-roboto.woff2) format('woff2');
 
+  unicode-range: U+1F00-1FFF;
 
+}
 
+/* greek */
 
+@font-face {
 
+  font-family: 'Roboto';
 
+  font-style: normal;
 
+  font-weight: 400;
 
+  src: local('Roboto'), local('Roboto-Regular'), url(fonts/greek-roboto.woff2) format('woff2');
 
+  unicode-range: U+0370-03FF;
 
+}
 
+/* vietnamese */
 
+@font-face {
 
+  font-family: 'Roboto';
 
+  font-style: normal;
 
+  font-weight: 400;
 
+  src: local('Roboto'), local('Roboto-Regular'), url(fonts/vietnamese-roboto.woff2) format('woff2');
 
+  unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
 
+}
 
+/* latin-ext */
 
+@font-face {
 
+  font-family: 'Roboto';
 
+  font-style: normal;
 
+  font-weight: 400;
 
+  src: local('Roboto'), local('Roboto-Regular'), url(fonts/latin-ext-roboto.woff2) format('woff2');
 
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 
+}
 
+/* latin */
 
+@font-face {
 
+  font-family: 'Roboto';
 
+  font-style: normal;
 
+  font-weight: 400;
 
+  src: local('Roboto'), local('Roboto-Regular'), url(fonts/latin-roboto.woff2) format('woff2');
 
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 
+}

+ 5 - 7
templates/index.html
View File 

@@ -3,19 +3,17 @@
 
   <head>
 
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
     <title></title>
 
-    <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
 
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.0/semantic.min.css" integrity="sha256-9mbkOfVho3ZPXfM7W8sV2SndrGDuh7wuyLjtsWeTI1Q=" crossorigin="anonymous" />
 
+    <link href="css/roboto.css" type="text/css" rel="stylesheet">
 
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.0/semantic.min.css"/>
 
     <link rel="stylesheet" type="text/css" href="css/codemirror.css">
 
     <link rel="stylesheet" type="text/css" href="css/show-hint.css">
 
     <link rel="stylesheet" type="text/css" href="css/ttcn.css">
 
     <link rel="stylesheet" type="text/css" href="css/ivprog-visual-1.0.css">
 
     <link rel="stylesheet" type="text/css" href="css/ivprog-term.css">
 
     <link rel="stylesheet" type="text/css" href="css/ivprog-editor.css">
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"
 
-      integrity="sha256-KM512VNnjElC30ehFwehXjx1YCHPiQkOPmqnrWtpccM="
 
-      crossorigin="anonymous"></script>
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.0/semantic.min.js" integrity="sha256-x1fC6BXl6BwnUhfQqqqC0Fd/n12wH+u8u9va6+E7xaA=" crossorigin="anonymous"></script>
 
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
 
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.0/semantic.min.js"></script>
 
     <script src="js/Sortable.js"></script>
 
     <script src="js/iassign-integration-functions.js"></script>
 
   </head>

+ 2 - 0
webpack.config.js
View File 

@@ -60,6 +60,8 @@ module.exports = {
 
         {from:"css/ivprog-visual-1.0.css", to:path.resolve(__dirname, 'build/css')},
 
         {from:"css/ivprog-term.css", to:path.resolve(__dirname, 'build/css')},
 
         {from:"css/ivprog-editor.css", to:path.resolve(__dirname, 'build/css')},
 
+        {from:"css/roboto.css", to:path.resolve(__dirname, 'build/css')},
 
+        {from:"css/fonts/", to:path.resolve(__dirname, 'build/css/fonts')},
 
         {from:'js/Sortable.js', to:path.resolve(__dirname, 'build/js')},
 
         {from: 'img/trash-icon.png', to:path.resolve(__dirname, 'build/img')},
 
         {from:'js/jquery.json-editor.min.js', to:path.resolve(__dirname, 'build/js')},