summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradamhrv <adam@ahprojects.com>2019-05-15 11:23:04 +0200
committeradamhrv <adam@ahprojects.com>2019-05-15 11:23:04 +0200
commitb5f29cdaede114c85c35fe6bf8c00a5eb60f1cc2 (patch)
treee962fc3ea668a70a7387812ece63bd1037108a54
parent5312831a4b4e09885c0dd38c45fb3b1fa6896306 (diff)
update cards
-rw-r--r--environment_bkup_20190209.yml305
-rw-r--r--site/assets/css/css.css75
-rw-r--r--site/assets/css/mobile.css22
3 files changed, 75 insertions, 327 deletions
diff --git a/environment_bkup_20190209.yml b/environment_bkup_20190209.yml
deleted file mode 100644
index 2b41c345..00000000
--- a/environment_bkup_20190209.yml
+++ /dev/null
@@ -1,305 +0,0 @@
-name: megapixels
-channels:
- - 1adrianb
- - alexbw
- - anaconda
- - pytorch
- - conda-forge
- - defaults
-dependencies:
- - face_alignment=1.0.0=py_1
- - lua=5.3.2=1
- - lua-cwrap=0.1=lua5.3_2
- - lua-paths=0.1=lua5.3_1
- - lua-torch=7.0.3=lua5.3_0
- - luarocks=2.2.1=lua5.3_0
- - glib=2.56.2=hd408876_0
- - libgcc=7.2.0=h69d50b8_2
- - libpng=1.6.35=hbc83047_0
- - matplotlib=2.2.2=py36hb69df0a_2
- - pyqt=5.6.0=py36_2
- - qt=5.6.3=h8bf5577_3
- - sqlite=3.25.3=h7b6447c_0
- - tk=8.6.8=hbc83047_0
- - bokeh=1.0.2=py36_1000
- - boost=1.68.0=py36h3e44d54_1
- - boost-cpp=1.68.0=h3a22d5f_0
- - ca-certificates=2018.11.29=ha4d7672_0
- - certifi=2018.11.29=py36_1000
- - click=7.0=py_0
- - cloudpickle=0.6.1=py_0
- - cryptography=2.3.1=py36hdffb7b8_0
- - cryptography-vectors=2.3.1=py36_1000
- - cycler=0.10.0=py_1
- - cytoolz=0.9.0.1=py36h470a237_1
- - dask=1.0.0=py_0
- - dask-core=1.0.0=py_0
- - distributed=1.25.0=py36_1000
- - expat=2.2.5=hfc679d8_2
- - ffmpeg=4.0.2=ha0c5888_2
- - fontconfig=2.13.1=h65d0f4c_0
- - freeglut=3.0.0=hfc679d8_5
- - freetype=2.9.1=h6debe1e_4
- - gflags=2.2.2=hfc679d8_0
- - glog=0.3.5=hfc679d8_1
- - gnutls=3.5.19=h2a4e5f8_1
- - h5py=2.8.0=py36h7eb728f_3
- - heapdict=1.0.0=py36_1000
- - imageio=2.4.1=py36_1000
- - kiwisolver=1.0.1=py36h2d50403_2
- - krb5=1.16.2=hc83ff2d_1000
- - leveldb=1.20=h00d4201_1
- - libcurl=7.63.0=h01ee5af_1000
- - libglu=9.0.0=hfc679d8_0
- - libgpuarray=0.7.6=h470a237_3
- - libiconv=1.15=h470a237_3
- - libssh2=1.8.0=h1ad7b7a_1003
- - libuuid=2.32.1=h470a237_2
- - lmdb=0.9.22=h470a237_0
- - locket=0.2.0=py_2
- - mako=1.0.7=py_1
- - mkl_fft=1.0.10=py36_0
- - mpi=1.0=openmpi
- - msgpack-python=0.6.0=py36h2d50403_0
- - nettle=3.3=0
- - networkx=2.2=py_1
- - openh264=1.8.0=hd28b015_0
- - openmpi=3.1.0=h26a2512_3
- - openssl=1.0.2p=h14c3975_1002
- - packaging=18.0=py_0
- - pandas=0.23.4=py36hf8a1672_0
- - partd=0.3.9=py_0
- - psutil=5.4.8=py36h470a237_0
- - pygpu=0.7.6=py36h7eb728f_0
- - pyparsing=2.3.0=py_0
- - python=3.6.6=h5001a0f_3
- - python-gflags=3.1.2=py_0
- - python-leveldb=0.193=py36_0
- - pywavelets=1.0.1=py36h7eb728f_0
- - sip=4.19.8=py36hfc679d8_0
- - snappy=1.1.7=hfc679d8_2
- - sortedcontainers=2.1.0=py_0
- - tblib=1.3.2=py_1
- - theano=1.0.3=py36hfc679d8_1
- - toolchain=2.3.0=0
- - toolchain_c_linux-64=2.3.0=0
- - toolchain_cxx_linux-64=2.3.0=0
- - toolz=0.9.0=py_1
- - tqdm=4.28.1=py_0
- - x264=1!152.20180717=h470a237_1
- - zict=0.1.3=py_0
- - _nb_ext_conf=0.4.0=py36_1
- - anaconda-client=1.6.14=py36_0
- - asn1crypto=0.24.0=py36_0
- - backcall=0.1.0=py36_0
- - blas=1.0=mkl
- - bleach=2.1.3=py36_0
- - bzip2=1.0.6=h14c3975_5
- - caffe=1.0=py36h7073e3f_4
- - cairo=1.14.12=h8948797_3
- - cffi=1.11.5=py36h9745a5d_0
- - chardet=3.0.4=py36h0f667ec_1
- - clyent=1.2.2=py36h7e57e65_1
- - cudatoolkit=9.0=h13b8566_0
- - dbus=1.13.2=h714fa37_1
- - decorator=4.3.0=py36_0
- - entrypoints=0.2.3=py36h1aec115_2
- - gmp=6.1.2=h6c8ec71_1
- - graphite2=1.3.11=h16798f4_2
- - gst-plugins-base=1.14.0=hbbd80ab_1
- - gstreamer=1.14.0=hb453b48_1
- - harfbuzz=1.8.8=hffaf4a1_0
- - hdf5=1.10.2=hba1933b_1
- - html5lib=1.0.1=py36h2f9c1c0_0
- - icu=58.2=h9c2bf20_1
- - idna=2.7=py36_0
- - intel-openmp=2018.0.3=0
- - ipykernel=4.8.2=py36_0
- - ipython=6.4.0=py36_0
- - ipython_genutils=0.2.0=py36hb52b0d5_0
- - ipywidgets=7.2.1=py36_0
- - jasper=2.0.14=h07fcdf6_1
- - jedi=0.12.0=py36_1
- - jinja2=2.10=py36ha16c418_0
- - jpeg=9b=h024ee3a_2
- - jsonschema=2.6.0=py36h006f8b5_0
- - jupyter_client=5.2.3=py36_0
- - jupyter_core=4.4.0=py36h7c827e3_0
- - libboost=1.67.0=h46d08c1_4
- - libedit=3.1.20170329=h6b74fdf_2
- - libffi=3.2.1=hd88cf55_4
- - libgcc-ng=8.2.0=hdf63c60_1
- - libgfortran=3.0.0=1
- - libgfortran-ng=7.2.0=hdf63c60_3
- - libopencv=3.4.2=hb342d67_1
- - libopus=1.2.1=hb9ed12e_0
- - libprotobuf=3.6.1=hd408876_0
- - libsodium=1.0.16=h1bed415_0
- - libstdcxx-ng=8.2.0=hdf63c60_1
- - libtiff=4.0.9=he85c1e1_1
- - libvpx=1.7.0=h439df22_0
- - libxcb=1.13=h1bed415_1
- - libxml2=2.9.8=h26e45fe_1
- - markupsafe=1.0=py36hd9260cd_1
- - mistune=0.8.3=py36h14c3975_1
- - mkl=2018.0.3=1
- - mkl-rt=11.1=p0
- - mkl-service=1.1.2=py36h90e4bf4_5
- - mkl_random=1.0.1=py36h629b387_0
- - nb_anacondacloud=1.4.0=py36_0
- - nb_conda=2.2.1=py36h8118bb2_0
- - nb_conda_kernels=2.1.0=py36_0
- - nbconvert=5.3.1=py36hb41ffb7_0
- - nbformat=4.4.0=py36h31c9010_0
- - nbpresent=3.0.2=py36h5f95a39_1
- - ncurses=6.1=hf484d3e_0
- - ninja=1.8.2=py36h6bb024c_1
- - notebook=5.5.0=py36_0
- - numpy=1.15.4=py36h1d66e8a_0
- - numpy-base=1.15.4=py36h81de0dd_0
- - olefile=0.45.1=py36_0
- - opencv=3.4.1=py36h6fd60c2_1
- - pandoc=2.2.1=h629c226_0
- - pandocfilters=1.4.2=py36ha6701b7_1
- - parso=0.2.1=py36_0
- - pcre=8.42=h439df22_0
- - pexpect=4.6.0=py36_0
- - pickleshare=0.7.4=py36h63277f8_0
- - pillow=5.2.0=py36heded4f4_0
- - pip=10.0.1=py36_0
- - pixman=0.34.0=hceecf20_3
- - prompt_toolkit=1.0.15=py36h17d85b1_0
- - protobuf=3.6.1=py36he6710b0_0
- - ptyprocess=0.6.0=py36_0
- - py-boost=1.67.0=py36h04863e7_4
- - py-opencv=3.4.2=py36hb342d67_1
- - pycparser=2.18=py36hf9f622e_1
- - pygments=2.2.0=py36h0d3125c_0
- - pyopenssl=18.0.0=py36_0
- - pysocks=1.6.8=py36_0
- - python-dateutil=2.7.3=py36_0
- - pytz=2018.5=py36_0
- - pyyaml=3.12=py36hafb9ca4_1
- - pyzmq=17.0.0=py36h14c3975_0
- - readline=7.0=ha6073c6_4
- - requests=2.19.1=py36_0
- - scipy=1.1.0=py36hc49cb51_0
- - send2trash=1.5.0=py36_0
- - setuptools=39.2.0=py36_0
- - simplegeneric=0.8.1=py36_2
- - six=1.11.0=py36h372c433_1
- - terminado=0.8.1=py36_1
- - testpath=0.3.1=py36h8cadb63_0
- - tornado=5.0.2=py36_0
- - traitlets=4.3.2=py36h674d592_0
- - urllib3=1.23=py36_0
- - wcwidth=0.1.7=py36hdf4376a_0
- - webencodings=0.5.1=py36h800622e_1
- - wheel=0.31.1=py36_0
- - widgetsnbextension=3.2.1=py36_0
- - xz=5.2.4=h14c3975_4
- - yaml=0.1.7=had09818_2
- - zeromq=4.2.5=h439df22_0
- - zlib=1.2.11=ha838bed_2
- - cuda90=1.0=h6433d27_0
- - pytorch=0.4.1=py36_py35_py27__9.0.176_7.1.2_2
- - torchvision=0.2.1=py36_1
- - pip:
- - absl-py==0.2.2
- - antlr4-python3-runtime==4.7.2
- - astor==0.7.1
- - beautifulsoup4==4.6.0
- - blocksparse==1.0.0
- - boto3==1.9.66
- - botocore==1.12.66
- - bs4==0.0.1
- - cachetools==2.1.0
- - cfgraph==0.2.1
- - colorama==0.4.0
- - colorlog==3.1.4
- - cython==0.28.4
- - dataclasses==0.6
- - dlib==19.16.0
- - docutils==0.14
- - exifread==2.1.2
- - face-recognition==1.2.3
- - face-recognition-models==0.3.0
- - flask==1.0.2
- - flask-cors==3.0.6
- - flask-sqlalchemy==2.3.2
- - flickr-api==0.6.1
- - future==0.16.0
- - gast==0.2.0
- - gdown==3.6.4
- - grpcio==1.13.0
- - horovod==0.13.8
- - html2text==2018.1.9
- - httplib2==0.12.0
- - imagehash==4.0
- - imutils==0.4.6
- - isodate==0.6.0
- - itsdangerous==0.24
- - jmespath==0.9.3
- - jonasz-master-thesis==0.1
- - jsonasobj==1.2.1
- - keras==2.2.0
- - keras-applications==1.0.6
- - keras-preprocessing==1.0.5
- - lasagne==0.2.dev1
- - lxml==4.2.5
- - markdown==2.6.11
- - moviepy==0.2.3.5
- - msgpack==0.6.0
- - mtcnn==0.0.8
- - mwoauth==0.3.3
- - nose==1.3.7
- - oauth2==1.9.0.post1
- - oauthlib==3.0.0
- - opencv-contrib-python==3.4.3.18
- - opencv-python==3.4.2.17
- - pdfminer.six==20170720
- - pyasn1==0.4.4
- - pyasn1-modules==0.2.2
- - pycryptodome==3.7.0
- - pycurl==7.43.0.2
- - pyglet==1.3.2
- - pyjsg==0.9.0
- - pyjwt==1.7.1
- - pymediainfo==2.3.0
- - pyopengl==3.1.0
- - pyserial==3.4
- - pyshex==0.6.1
- - pyshexc==0.5.4
- - python-dotenv==0.10.1
- - python-magic==0.4.15
- - python-slugify==1.2.5
- - pyusb==1.0.2
- - pywavefront==0.3.2
- - rdflib==4.2.2
- - rdflib-jsonld==0.4.0
- - requests-oauthlib==1.2.0
- - rsa==4.0
- - s3cmd==2.0.2
- - s3transfer==0.1.13
- - scikit-learn==0.20.1
- - selenium==3.13.0
- - shexjsg==0.5.6
- - simplejson==3.16.0
- - sparql-slurper==0.1.3
- - sparqlwrapper==1.8.2
- - sqlalchemy==1.2.15
- - tensorboard==1.10.0
- - tensorflow-gpu==1.10.0
- - termcolor==1.1.0
- - tflearn==0.3.2
- - toposort==1.5
- - torch==0.4.1.post2
- - unicode==2.6
- - unidecode==1.0.22
- - visvis==1.11.1
- - werkzeug==0.14.1
- - wikipedia-api==0.4.2
- - wptools==0.4.17
- - youtube-dl==2018.11.3
-prefix: /home/adam/anaconda3/envs/megapixels
-
diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index c76476e2..488a35f2 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -27,6 +27,9 @@ img { border: 0; }
html.desktop .content,
html.mobile .content {
opacity: 1;
+ margin-top: 50px;
+}
+html.mobile .content{
}
/* header */
@@ -172,7 +175,6 @@ footer a {
display: inline-block;
color: #aaa;
transition: all 0.1s cubic-bezier(0,0,1,1);
- border-bottom: 1px solid #555;
padding-bottom: 1px;
text-decoration: none;
}
@@ -212,7 +214,7 @@ h1 {
color: #eee;
font-weight: 400;
font-size: 34pt;
- margin: 75px auto 10px auto;
+ margin: 20px auto 10px auto;
padding: 0;
transition: color 0.1s cubic-bezier(0,0,1,1);
font-family: 'Roboto Mono', monospace;
@@ -333,7 +335,7 @@ th, .gray {
padding-top: 28px;
padding-bottom: 100px;
min-height: calc(100vh - 55px);
- line-height: 1.5;
+ line-height: 1.8;
}
section {
width: 960px;
@@ -352,7 +354,7 @@ section {
}
section p {
margin: 10px auto 20px auto;
- line-height: 1.85rem;
+ line-height: 1.9rem;
font-size: 17px;
font-weight: 400;
color: #cdcdcd;
@@ -403,6 +405,10 @@ p.subp{
padding-bottom: 5px;
line-height: 14px
}
+.mobile .meta .gray {
+ font-size: 10px;
+ padding-bottom: 0px;
+}
.right-sidebar {
float: right;
width: 200px;
@@ -430,6 +436,13 @@ p.subp{
.left-sidebar .meta, .right-sidebar .meta {
flex-direction: column;
}
+.mobile .left-sidebar .meta, .right-sidebar .meta {
+ display: inline-block;
+ border-bottom: 1px solid #333;
+ padding:10px 10px 10px 0;
+ margin: 0 4px 4px 0;
+ color: #bbb;
+}
.right-sidebar ul {
margin-bottom: 10px;
color: #aaa;
@@ -813,6 +826,7 @@ section.fullwidth .image {
}
.content .dataset-intro .first_paragraph {
margin-top: 10px;
+ font-size: 18px;
}
/* intro - list of datasets */
@@ -820,7 +834,7 @@ section.fullwidth .image {
.dataset-heading {
/*background: #000;*/
width: 100%;
- padding: 10px;
+ padding: 0 25px;
}
.dataset-heading p{
max-width: none;
@@ -836,34 +850,41 @@ section.fullwidth .image {
}
.dataset-list a {
text-decoration: none;
- transition: background-color 0.1s cubic-bezier(0,0,1,1);
- background: black;
- margin: 0 11px 11px 0;
- border: 0;
+ transition: border 0.1s cubic-bezier(0,0,1,1);
+ margin: 0 11px 22px 0;
+ border: 1px solid #333;
+ border-radius: 4px;
}
.dataset-list .dataset {
width: 300px;
- padding: 10px;
+ padding: 12px;
color: white;
font-weight: 400;
font-family: 'Roboto';
position: relative;
- background: black;
}
.dataset-list .dataset-image {
background-size: cover;
- width: 300px;
+ width: auto;
height: 178px;
}
.desktop .content .dataset-list a {
- border: none;
+ border: 1px solid #333;
+
}
.desktop .dataset-list a:hover {
- border: none;
+ border: 1px solid #666;
}
-
.dataset-list .fields {
font-size: 12px;
+ color: #ccc;
+}
+.dataset-list .dataset .title{
+ font-size: 16px;
+ line-height: 20px;
+ margin-bottom: 4px;
+ font-weight: 400;
+ display: block;
}
.dataset-list .fields div {
display: block;
@@ -888,7 +909,7 @@ section.fullwidth .image {
color: #fff;
padding: 7px 11px;
border-radius: 4px;
- font-weight: 500;
+ font-weight: 400;
font-size: 14px;
cursor: pointer;
user-select: none;
@@ -923,13 +944,14 @@ section.intro_section {
width: 100%;
background-size: cover;
background-position: center left;
- padding: 50px 0;
+ /*padding: 50px 0;*/
min-height: 40vh;
display: flex;
justify-content: center;
align-items: center;
background-color: #111111;
- margin-bottom: 30px;
+ margin-bottom: 20px;
+ padding: 0;
}
.intro_section .inner {
max-width: 960px;
@@ -942,6 +964,11 @@ section.intro_section {
color: #ddd;
font-weight: 400;
}
+.mobile .intro_section .hero_desc{
+ font-size: 16px;
+ line-height: 32px;
+ margin-bottom: 20px;
+}
.intro_section .hero_desc .dataset-name{
color:#fff;
}
@@ -952,6 +979,10 @@ section.intro_section {
font-weight: 400;
color: #ddd;
}
+.mobile .intro_section .hero_subdesc {
+ font-size: 14px;
+ line-height: 28px;
+}
.intro_section .hero_desc .bgpad {
box-shadow: -10px -10px #181818, 10px -10px #181818, 10px 10px #181818, -10px 10px #181818;
background: #181818;
@@ -960,6 +991,14 @@ section.intro_section {
box-shadow: -10px -10px #181818, 10px -10px #181818, 10px 10px #181818, -10px 10px #181818;
background: #181818;
}
+.mobile .intro_section .hero_desc .bgpad {
+ box-shadow: -6px -6px #181818, 6px -6px #181818, 6px 6px #181818, -6px 6px #181818;
+ background: #181818;
+}
+.mobile .intro_section .hero_subdesc .bgpad {
+ box-shadow: -6px -6px #181818, 6px -6px #181818, 6px 6px #181818, -6px 6px #181818;
+ background: #181818;
+}
.firefox .intro_section div > span {
diff --git a/site/assets/css/mobile.css b/site/assets/css/mobile.css
index 825a7012..124b9d42 100644
--- a/site/assets/css/mobile.css
+++ b/site/assets/css/mobile.css
@@ -48,7 +48,8 @@ softbr {
flex-wrap: wrap;
}
h1 {
- font-size: 34px;
+ font-size: 32px;
+ line-height: 44px;
}
/* MOBILE content */
@@ -74,13 +75,23 @@ softbr {
}
section {
width: 100%;
- padding: 0 10px;
+ padding: 0 25px;
+ }
+ section p{
+ font-size: 15px;
}
section.about-menu {
padding: 0;
}
+ .content-about .about-menu ul li{
+ font-size: 12px;
+ }
+ .content-about .team-member p{
+ font-size: 13px;
+ line-height: 26px;
+ }
.content-about section:first-of-type > p:first-of-type {
- font-size: 18px;
+ font-size: 16px;
line-height: 30px;
}
.meta {
@@ -89,6 +100,7 @@ softbr {
}
.modal img {
max-width: 100%;
+ display: block;
}
th {
overflow: hidden;
@@ -119,7 +131,8 @@ softbr {
.content-about .team-member {
margin: 0 0 10px 0;
- padding: 10px;
+ padding: 15px;
+ margin-bottom: 25px;
}
.page_name {
display: none;
@@ -146,6 +159,7 @@ softbr {
}
.columns .column {
margin: 0;
+ margin-bottom: 25px;
}
.columns-2 .column,
.columns-3 .column,